From f732e617541df9cb6d0f5c9c478ebe812c5df8ab Mon Sep 17 00:00:00 2001 From: OverloadedOrama <35376950+OverloadedOrama@users.noreply.github.com> Date: Sun, 22 Dec 2019 22:51:21 +0200 Subject: [PATCH] Changed color switch & default buttons their textures and positions again --- .../Dark Themes/Misc/Color defaults.png | Bin 607 -> 609 bytes .../Dark Themes/Misc/Color switch.png | Bin 629 -> 635 bytes .../Light Themes/Misc/Color defaults.png | Bin 606 -> 609 bytes .../Light Themes/Misc/Color switch.png | Bin 642 -> 655 bytes Main.tscn | 43 ++++++++++-------- 5 files changed, 23 insertions(+), 20 deletions(-) diff --git a/Assets/Graphics/Dark Themes/Misc/Color defaults.png b/Assets/Graphics/Dark Themes/Misc/Color defaults.png index 43a66a1d456cb52739a705348da309b57229c221..b6467132c3f71ba6b18a0030778dba7a58ea4cf5 100644 GIT binary patch delta 147 zcmcc5@{mQbGr-TCmrII^fq{Y7)59eQNJ|1S2L~IFFVdQ&MBb@0INSUIsgCw delta 145 zcmaFJa-T)9Gr-TCmrII^fq{Y7)59eQL<2E92OE&QTyR`!qvA|PP9U3s;ivQN`pJhG z71@Oqlr}NNEu8$CQNzdF)5S4F;&O6IL(|vS*Z-$0FfcJQOG;iaS?~bFcV{nX-k5n{ pDd)0@osB#W)6_QoIpX2>f{{TtDaA;$;a)w+U{6;+mvv4FO#t!wFi-#h diff --git a/Assets/Graphics/Dark Themes/Misc/Color switch.png b/Assets/Graphics/Dark Themes/Misc/Color switch.png index 5abefba4821e3572f5369d8a0533ed8a667d8912..4f78c2d83195cdabce2ccaaec714e3831199e7ef 100644 GIT binary patch delta 173 zcmey$@|#7mGr-TCmrII^fq{Y7)59eQNJ|1SI|mz({A>EGW253sM$YvNKsdirTxRlN zMn!fJ1EymStM*QQ&8U$P?CIhdqH%ufBu6d=Lk?!)56$~b{7dv>KRnnLcEhr(la1AG zg2*H$UcbFzoEKb#?(Dr}bUioeAKwjuY(^%A{IlvCCbsa-UwbX6M2=9!QEcr(pbHp0UHx3vIVCg!0FN0xb^rhX delta 167 zcmey(@|8ugGr-TCmrII^fq{Y7)59eQL<2E92OE&QTyR`!qvA|PP9U3s;ivQN`pJhG z71@Oi)H_z~sGt0rQ6tIM)5S4F;&N|)Am0H69;bs9j((>EpP$bvF)OVxtz8&!>)0Z8 zhQh4d+xb_RRG#OV^lXml!ne_f7XB-X?e&>tCTIUKor7_~(NNE&hC5Vvm|4Ysd@wbO P2U+Lo>gTe~DWM4f?Tk6Z diff --git a/Assets/Graphics/Light Themes/Misc/Color defaults.png b/Assets/Graphics/Light Themes/Misc/Color defaults.png index abfadac0ea6105369612f7047ac0eca9e95f2353..dc5bbba847ece30caebb9f8d452de30cd31f5493 100644 GIT binary patch delta 147 zcmcb|@{mQbGr-TCmrII^fq{Y7)59eQNJ|1S2L~IFgTe~DWM4ftXM5+ delta 144 zcmaFJa*su^Gr-TCmrII^fq{Y7)59eQL<2E92OE&QTyR`!qvA|PP9U3s;ivQN`pJhG z71@QwWPa6Os-OItQN!EJ)5S4F;&O6ILsN&r`u{vE2f9LUOGsWYS?~bFf5DJvV8*+{ o;RMDLmt3aJmpI93%b=hfRa&O7;|9oFPgg&ebxsLQ0J*9zkN^Mx diff --git a/Assets/Graphics/Light Themes/Misc/Color switch.png b/Assets/Graphics/Light Themes/Misc/Color switch.png index e4b523c10c8c569215ac4af720467e04d71de45e..03130879f61dc766aa08229717604141bb2fa311 100644 GIT binary patch delta 193 zcmZo-?Ppc&4DfU3<&xrJU|`_&^l%9R(vm>T&cOyG|C&DQ*r+&@k#ju*5YDd@mzjK+ zQITClU(YgG;=ttBj2boRo-U3d8t0P}4lpVm+Vju7rSfmO0+T?{X_wB2udlB^zDhiH z4r?SMGbh7cg_I3NKi~WpOpN2v4$DnWNdN+ss|7_2%8K(_+?N>%8Kpe^bhF~?CWXqm qg7eve7&aYdVrD++Z@6RyE5mgj)AcDWc4vXEV(@hJb6Mw<&;$T6T|+Sd delta 180 zcmeBYZDLjI4DfU3<&xrJU|`_&^l%9R(Ll`3!3HER7aW(`s5q066Ub&@`02d6e)3^P zMRs9Df#h>`36ozlYUD?Gx;TbNTuzSJUuVnAvnIywcYQ^QmNK)HgLt~rw1fl96Q0i8 zkjcTr(~_JcC8>O9&xczLyawyy_sbn!_TfZ`TZ;6Clg0-nj@)1fKF(rXdURE8h3TOu c%*@P^4Bm_M5AAN)nGLer)78&qol`;+09|rB;{X5v diff --git a/Main.tscn b/Main.tscn index 419146f86..6cbe05318 100644 --- a/Main.tscn +++ b/Main.tscn @@ -226,6 +226,7 @@ text = "[64×64]" align = 2 [node name="UI" type="HBoxContainer" parent="MenuAndUI"] +editor/display_folded = true margin_top = 28.0 margin_right = 1152.0 margin_bottom = 648.0 @@ -374,6 +375,7 @@ button_mask = 3 texture_normal = ExtResource( 9 ) [node name="ColorAndToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools"] +editor/display_folded = true margin_top = 159.0 margin_right = 208.0 margin_bottom = 612.0 @@ -382,10 +384,10 @@ custom_constants/separation = 8 alignment = 1 [node name="ColorButtonsVertical" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"] -margin_top = 56.0 +margin_top = 50.0 margin_right = 208.0 -margin_bottom = 94.0 -custom_constants/separation = -4 +margin_bottom = 101.0 +custom_constants/separation = 2 [node name="ColorSwitchCenter" type="CenterContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical"] margin_right = 208.0 @@ -394,8 +396,8 @@ margin_bottom = 7.0 [node name="ColorSwitch" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical/ColorSwitchCenter" groups=[ "UIButtons", ]] -margin_left = 97.0 -margin_right = 110.0 +margin_left = 91.0 +margin_right = 116.0 margin_bottom = 7.0 hint_tooltip = "COLORSWITCH_HT" mouse_default_cursor_shape = 2 @@ -404,9 +406,9 @@ shortcut = SubResource( 2 ) texture_normal = ExtResource( 10 ) [node name="ColorPickersCenter" type="CenterContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical"] -margin_top = 3.0 +margin_top = 9.0 margin_right = 208.0 -margin_bottom = 35.0 +margin_bottom = 41.0 [node name="ColorPickersHorizontal" type="HBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical/ColorPickersCenter"] margin_left = 33.0 @@ -435,30 +437,30 @@ size_flags_vertical = 0 color = Color( 1, 1, 1, 1 ) [node name="ColorDefaultsCenter" type="CenterContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical"] -margin_top = 31.0 +margin_top = 43.0 margin_right = 208.0 -margin_bottom = 38.0 +margin_bottom = 51.0 size_flags_horizontal = 3 [node name="ColorDefaults" type="TextureButton" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/ColorButtonsVertical/ColorDefaultsCenter" groups=[ "UIButtons", ]] -margin_left = 97.0 -margin_right = 110.0 -margin_bottom = 7.0 +margin_left = 91.0 +margin_right = 116.0 +margin_bottom = 8.0 hint_tooltip = "COLORDEFAULTS_HT" mouse_default_cursor_shape = 2 texture_normal = ExtResource( 11 ) [node name="HSeparator" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"] -margin_top = 102.0 +margin_top = 109.0 margin_right = 208.0 -margin_bottom = 106.0 +margin_bottom = 113.0 [node name="LeftToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"] -margin_top = 114.0 +margin_top = 121.0 margin_right = 208.0 -margin_bottom = 245.0 +margin_bottom = 252.0 [node name="LeftLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/LeftToolOptions"] margin_right = 208.0 @@ -630,14 +632,14 @@ mouse_default_cursor_shape = 2 text = "Vertical" [node name="HSeparator2" type="HSeparator" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"] -margin_top = 253.0 +margin_top = 260.0 margin_right = 208.0 -margin_bottom = 257.0 +margin_bottom = 264.0 [node name="RightToolOptions" type="VBoxContainer" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions"] -margin_top = 265.0 +margin_top = 272.0 margin_right = 208.0 -margin_bottom = 396.0 +margin_bottom = 403.0 [node name="RightLabel" type="Label" parent="MenuAndUI/UI/ToolPanel/Tools/ColorAndToolOptions/RightToolOptions"] margin_right = 208.0 @@ -809,6 +811,7 @@ mouse_default_cursor_shape = 2 text = "Vertical" [node name="CanvasAndTimeline" type="VBoxContainer" parent="MenuAndUI/UI"] +editor/display_folded = true margin_left = 224.0 margin_right = 928.0 margin_bottom = 620.0