From 126df5317f9b1415f1461857761717ebb24dc625 Mon Sep 17 00:00:00 2001 From: Xananax Date: Sun, 23 Apr 2023 01:07:22 +0200 Subject: [PATCH] better button --- assets/default_theme.theme | Bin 1413 -> 1403 bytes ui/composed_ui.tscn | 43 ++++++++++++++++++++++++++----------- ui/time_counter.tscn | 21 +++++++++++------- 3 files changed, 44 insertions(+), 20 deletions(-) diff --git a/assets/default_theme.theme b/assets/default_theme.theme index e8fb9a5ca997be84db74001865b8d795cb05ac37..bd50a7f216ae6ec456b2e1fbb11cbe1131e2a3e6 100644 GIT binary patch literal 1403 zcmV->1%&!iQ$s@n000005C8zJ5C8!91ONbM0000ewJ-f(01tI100#4`MZg*-9b^Hh z>m{->i+ay3CMxDvC(?l0{|eX>w7}aQO}-7;?ZbAHCJC{*-wukX3YWhekdOfT&@{51 z&LXP9U{BrkkphDNjR2DXw)3|CGB?fgr0o??NTp|E3pVAZmFrJhuE2G&8eH7wjH}qO zgH7w||IB&8ZDer@-m2YoWALvw^r+7|MY*wxy39Q{|OBEFW?U!-|RMxeQD)j zRW;+kg?k&bwYj&VaBqWK?8!8KmZ^+QD~c`3z-if~U@Bj9d@tK?#+I$rvW?2RF0QUR zo?E=K%P!AY-;CC7mkRcD#T9qZqw+>MBa}@e-_@$VY8P2IK}X{U<0)fvXL9i1bX~HG z7Fwnj=N;v_)htkefYqIRLCc-3+ly;l${c*fJTpnYQ={Ri(va(*XiC~k9G!%YhoG_f zh#AvC$kcqN%TZa@bK}{#Ig^?7V(V%c8~Ca_r&<|NWViX=m}NbeEl|^{f|IRCV?h58 z{3m_#7ANGE?63BX&@gT|XKdYAoS&SqL7tvh8~&GYI)AZ-eB+jN)K#qqC;T>m6(-A* zEO_CTw=G&Ps^+Ygi!p;%+0n)U{-6GzI1C>XJtatt;1Ll5#12X)%lY7;1BVSer9Xgx z96GcfJ$!s#zGzvpXi2@8LPbUbgcebxXhcLtQXGhk$Y@utV9|ntaA-wEOin?BXg)JS!s)}cY}CPz9kg4-!BGAxSX|5+TJ95s3sTX*p#j!vX86pth0_ zbH09ckPIzLy>i-Jo$wzmuAOfHEgUTKWb!5|Ch~alpuLWvVEU35;Cy%B4vyinMaJn}mW^ZVbBZGPv^cAxLw|ciRt13rJTg8}*_^$6L&K1|r`B(=MFz zd*CVf@ubcM+d&>8OGQ9LVkn**Ky}H7c_wb$LJ8n@As?*&l9?*3b90+~_C14B-dkUd z@!brA2l_j~A>qm$$=#KXI~HKA>T3~-AxbP<9*jT$M7!}Fdr%i1Sd4(O8yKaXGyqU7 zgYx2zGZ`%)3`{oQBQKQE!W6a4h=5#%BeJ2{dZk{$p8L`>i@^mdus9Hr zoH!&36+(k*fG(ZH{qkgDQ?hU=1ED6bG5Nlvn17x}EYKm8KIRBfl|$vYM}GW@T~HcL zf1-Tb;MjYKXBr)hjI-$TEp3moq&F)2y>rnI&n#|ax{1c{VVDx(vC)W!hC>vhke12v zfsVRLE{sjl;=S+Nv52oI$kpTiQ#2F!8NqBS%Ku;#)@DE#sU1+GL>$_Y=?WydC_#}3 z*tK#Xg!@8YUiJF#{PH6gX6z+gxPHJSi8=j61U-~q$sxOWsOMvLshb0{JkJqTDHP{D zT%idlwJ-f3t@Q!`f`t$oaBa&00G)W1I>VqVMu(Ri>s%Rq4D=+6Tok@qBoH%|wgc?tl)L{(Qq)?hGA8bT=K0BK!W1`ILd JsWMViLqm<@m%RW0 literal 1413 zcmV;01$z2YQ$s@n000005C8zU5C8!D1ONbS0000ewJ-f(01uTX0Jie0M8H}}IzR}Z zKxY~;5)A`@0CTNJ4Dxw}WuKwJtV-Qp$h3S${ML66EC<&01^jeNVV8dWZ`t^$t6@5NKbX70wpgVc3NE?Q`r z+MIKgr)I-oK>}8D(g<4SY}Jf-#-+SLqZmIlOx|PTa}|onc~mv16d&Q`B7FQqjf01v z(Yen|>OEtw!Z08lkH+2kT#&7+Uu@uA_fEAk5@EOb-iTp9mu*qgYGRYENRNvCBlv&% zWGzm}E!kh~8=+s^aL(AeM{#~~f(ChdUTyeaLhAe-HRKyLjH9kEQ&%PzE714-y~*AxSX|5-G(H5s3sTX*p#j!vS?G2r*&t zSLZOkEW4A#@9LNzwRo(3X|#ku&4lrrV429{`9piX#l*-_S7tb`1zseMIo!dFy(dSy zU@-S4OM%n+#@PG~TB9*$ZL5K+;SND2r;yx!$XZak(%PsPEjspM&MOf4B{1#6Ie!P9 zf*c>xn-F*8!DDGOu)`(A#Nkw%)R^4F4K0)aZtLVj`UjY)#1wbUl=KcKb3}UkPY?Vy z!{dPo5AY)#xCr?nCZUlN)}lJN1z}Psf9SHIhNw2a`GLQToU^R z>vohBKD4PrugU4`k%l8-$Z>ZYrMy0=Zkow`X^^Hw8rI|PkgCR0DI`P<|#YYq( zESVTkujg1{To-NWO>P{UVTt0dF87zB3&G0>d{Zs_uSDiH(YmVcAO{+YQ#cx3YSINI z9Epfs_X9z(FK+S_)^$goce$Ws7vX~RgF%w*=_4XrLrY3V+)Z6QE2&F@ITX+H1~G|m zpf$@$F3|)iwJ-f3xFrJsLd6goaBa&00Il>@>I{Rf9EsTM3;+NDfoKwHLQ;z<*b~AX z41ZSF8jQrNw8g^#VUJXS@a4^5MDiX*9eTRp&Y1%qI0*~@z@)0X9~&U%k!S;mMxW7y T1XCJp0T>tfW0R>TQd2`ihd7aY diff --git a/ui/composed_ui.tscn b/ui/composed_ui.tscn index 6f70e37..1a068c1 100644 --- a/ui/composed_ui.tscn +++ b/ui/composed_ui.tscn @@ -22,31 +22,48 @@ margin_bottom = 755.0 [node name="VBoxContainerPrimary" type="VBoxContainer" parent="VBoxContainer"] unique_name_in_owner = true margin_right = 350.0 -margin_bottom = 187.0 +margin_bottom = 142.0 [node name="TimeCounter" parent="VBoxContainer/VBoxContainerPrimary" instance=ExtResource( 3 )] anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 350.0 -margin_bottom = 141.0 +margin_bottom = 142.0 -[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer/VBoxContainerPrimary"] -margin_top = 148.0 +[node name="HBoxContainer2" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter" index="0"] margin_right = 350.0 -margin_bottom = 187.0 -alignment = 2 +margin_bottom = 40.0 -[node name="ToggleTabContainerButton" type="Button" parent="VBoxContainer/VBoxContainerPrimary/HBoxContainer"] +[node name="ToggleTabContainerButton" type="Button" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter/HBoxContainer2" index="0"] unique_name_in_owner = true -margin_left = 329.0 -margin_right = 350.0 -margin_bottom = 39.0 +margin_right = 40.0 +margin_bottom = 40.0 theme_type_variation = "panel_toggle_button" toggle_mode = true +[node name="TaskNameLineEdit" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter/HBoxContainer2" index="1"] +margin_left = 48.0 +margin_right = 350.0 +margin_bottom = 40.0 + +[node name="HBoxContainer" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter" index="1"] +margin_top = 47.0 +margin_right = 350.0 +margin_bottom = 142.0 + +[node name="TimeLabel" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter/HBoxContainer" index="0"] +margin_top = 0.0 +margin_right = 270.0 +margin_bottom = 95.0 + +[node name="StartButton" parent="VBoxContainer/VBoxContainerPrimary/TimeCounter/HBoxContainer" index="1"] +margin_left = 278.0 +margin_right = 350.0 +margin_bottom = 95.0 + [node name="TabContainer" type="TabContainer" parent="VBoxContainer"] unique_name_in_owner = true -margin_top = 194.0 +margin_top = 149.0 margin_right = 350.0 margin_bottom = 750.0 size_flags_vertical = 3 @@ -73,4 +90,6 @@ size_flags_vertical = 3 anchor_right = 0.0 anchor_bottom = 0.0 margin_right = 342.0 -margin_bottom = 520.0 +margin_bottom = 565.0 + +[editable path="VBoxContainer/VBoxContainerPrimary/TimeCounter"] diff --git a/ui/time_counter.tscn b/ui/time_counter.tscn index 5ced5a3..1a94295 100644 --- a/ui/time_counter.tscn +++ b/ui/time_counter.tscn @@ -7,14 +7,19 @@ anchor_right = 1.0 anchor_bottom = 1.0 script = ExtResource( 1 ) -[node name="TaskNameLineEdit" type="LineEdit" parent="."] +[node name="HBoxContainer2" type="HBoxContainer" parent="."] +margin_right = 360.0 +margin_bottom = 45.0 + +[node name="TaskNameLineEdit" type="LineEdit" parent="HBoxContainer2"] unique_name_in_owner = true margin_right = 360.0 -margin_bottom = 24.0 +margin_bottom = 45.0 +size_flags_horizontal = 3 placeholder_text = "Task Name. Use \"/\" to create subtasks" [node name="HBoxContainer" type="HBoxContainer" parent="."] -margin_top = 28.0 +margin_top = 53.0 margin_right = 360.0 margin_bottom = 760.0 size_flags_horizontal = 3 @@ -22,9 +27,9 @@ size_flags_vertical = 3 [node name="TimeLabel" type="Label" parent="HBoxContainer"] unique_name_in_owner = true -margin_top = 359.0 -margin_right = 344.0 -margin_bottom = 373.0 +margin_top = 341.0 +margin_right = 328.0 +margin_bottom = 366.0 size_flags_horizontal = 3 size_flags_vertical = 6 theme_type_variation = "time_label" @@ -34,9 +39,9 @@ valign = 1 [node name="StartButton" type="Button" parent="HBoxContainer"] unique_name_in_owner = true -margin_left = 348.0 +margin_left = 336.0 margin_right = 360.0 -margin_bottom = 732.0 +margin_bottom = 707.0 theme_type_variation = "play_button" [node name="Timer" type="Timer" parent="."]