From 950a6d77af360bcb1a9a3f5e0c7cdf7748c8d378 Mon Sep 17 00:00:00 2001 From: Emmanouil Papadeas Date: Tue, 20 Sep 2022 20:46:53 +0300 Subject: [PATCH] Move pencil's brush slider above "Overwrite color" again --- src/Tools/Eraser.tscn | 4 +-- src/Tools/Pencil.tscn | 19 +++++++++------ src/Tools/Shading.tscn | 55 ++++++++++++++++++++++-------------------- 3 files changed, 42 insertions(+), 36 deletions(-) diff --git a/src/Tools/Eraser.tscn b/src/Tools/Eraser.tscn index 70ce86120..89a5208f2 100644 --- a/src/Tools/Eraser.tscn +++ b/src/Tools/Eraser.tscn @@ -7,9 +7,9 @@ script = ExtResource( 2 ) [node name="Opacity" type="VBoxContainer" parent="." index="4"] -margin_top = 74.0 +margin_top = 82.0 margin_right = 116.0 -margin_bottom = 136.0 +margin_bottom = 144.0 [node name="OpacityLabel" type="Label" parent="Opacity" index="0"] margin_right = 116.0 diff --git a/src/Tools/Pencil.tscn b/src/Tools/Pencil.tscn index 8af7b622f..717f73646 100644 --- a/src/Tools/Pencil.tscn +++ b/src/Tools/Pencil.tscn @@ -6,10 +6,13 @@ [node name="ToolOptions" instance=ExtResource( 1 )] script = ExtResource( 3 ) -[node name="Label" parent="." index="0"] +[node name="ColorRect" parent="." index="0"] margin_right = 128.0 -[node name="Brush" parent="." index="1"] +[node name="Label" parent="." index="1"] +margin_right = 128.0 + +[node name="Brush" parent="." index="2"] margin_right = 128.0 [node name="Type" parent="Brush" index="0"] @@ -20,14 +23,14 @@ margin_right = 41.0 margin_left = 45.0 margin_right = 119.0 -[node name="BrushSize" parent="." index="2"] +[node name="BrushSize" parent="." index="3"] margin_left = 18.0 margin_right = 110.0 -[node name="Overwrite" type="CheckBox" parent="." index="3"] -margin_top = 74.0 +[node name="Overwrite" type="CheckBox" parent="." index="4"] +margin_top = 82.0 margin_right = 128.0 -margin_bottom = 98.0 +margin_bottom = 106.0 grow_horizontal = 2 grow_vertical = 2 hint_tooltip = "Overwrites color instead of blending it. This option is only relevant with colors that are not fully opaque" @@ -41,9 +44,9 @@ __meta__ = { [node name="FillInside" type="CheckBox" parent="." index="5"] margin_left = 19.0 -margin_top = 102.0 +margin_top = 110.0 margin_right = 109.0 -margin_bottom = 126.0 +margin_bottom = 134.0 mouse_default_cursor_shape = 2 size_flags_horizontal = 4 text = "Fill inside" diff --git a/src/Tools/Shading.tscn b/src/Tools/Shading.tscn index b0c446849..0b09ba53a 100644 --- a/src/Tools/Shading.tscn +++ b/src/Tools/Shading.tscn @@ -6,10 +6,13 @@ [node name="ToolOptions" instance=ExtResource( 1 )] script = ExtResource( 2 ) -[node name="Label" parent="." index="0"] +[node name="ColorRect" parent="." index="0"] margin_right = 126.0 -[node name="Brush" parent="." index="1"] +[node name="Label" parent="." index="1"] +margin_right = 126.0 + +[node name="Brush" parent="." index="2"] margin_right = 126.0 [node name="Type" parent="Brush" index="0"] @@ -20,31 +23,14 @@ margin_right = 40.0 margin_left = 44.0 margin_right = 118.0 -[node name="BrushSize" parent="." index="2"] -margin_left = 17.0 -margin_right = 109.0 - -[node name="ColorInterpolation" parent="." index="3"] -margin_top = 216.0 -margin_right = 126.0 -margin_bottom = 278.0 - -[node name="Label" parent="ColorInterpolation" index="0"] -margin_left = 9.0 -margin_right = 116.0 - -[node name="Factor" parent="ColorInterpolation" index="1"] -margin_left = 26.0 -margin_right = 100.0 - -[node name="Slider" parent="ColorInterpolation" index="2"] +[node name="BrushSize" parent="." index="3"] margin_left = 17.0 margin_right = 109.0 [node name="ShadingMode" type="OptionButton" parent="." index="4"] -margin_top = 74.0 +margin_top = 82.0 margin_right = 126.0 -margin_bottom = 94.0 +margin_bottom = 102.0 mouse_default_cursor_shape = 2 text = "Simple Shading" items = [ "Simple Shading", null, false, 0, null, "Hue Shifting", null, false, 1, null ] @@ -52,9 +38,9 @@ selected = 0 [node name="LightenDarken" type="OptionButton" parent="." index="5"] margin_left = 17.0 -margin_top = 98.0 +margin_top = 106.0 margin_right = 109.0 -margin_bottom = 118.0 +margin_bottom = 126.0 rect_min_size = Vector2( 92, 0 ) mouse_default_cursor_shape = 2 size_flags_horizontal = 4 @@ -63,9 +49,9 @@ items = [ "Lighten", null, false, 0, null, "Darken", null, false, 1, null ] selected = 0 [node name="Amount" type="VBoxContainer" parent="." index="6"] -margin_top = 122.0 +margin_top = 130.0 margin_right = 126.0 -margin_bottom = 184.0 +margin_bottom = 192.0 alignment = 1 [node name="Label" type="Label" parent="Amount" index="0"] @@ -221,6 +207,23 @@ size_flags_vertical = 1 value = 10.0 ticks_on_borders = true +[node name="ColorInterpolation" parent="." index="8"] +margin_top = 216.0 +margin_right = 126.0 +margin_bottom = 278.0 + +[node name="Label" parent="ColorInterpolation" index="0"] +margin_left = 9.0 +margin_right = 116.0 + +[node name="Factor" parent="ColorInterpolation" index="1"] +margin_left = 26.0 +margin_right = 100.0 + +[node name="Slider" parent="ColorInterpolation" index="2"] +margin_left = 17.0 +margin_right = 109.0 + [connection signal="item_selected" from="ShadingMode" to="." method="_on_ShadingMode_item_selected"] [connection signal="item_selected" from="LightenDarken" to="." method="_on_LightenDarken_item_selected"] [connection signal="value_changed" from="Amount/Spinbox" to="." method="_on_LightenDarken_value_changed"]