From da34f0ae7bf0593ffe19996a25471c504e423bd5 Mon Sep 17 00:00:00 2001 From: Manolis Papadeas <35376950+OverloadedOrama@users.noreply.github.com> Date: Tue, 1 Mar 2022 02:16:53 +0200 Subject: [PATCH] Center the global tool options --- src/UI/GlobalToolOptions.tscn | 45 +++++++++++++++++++++-------------- src/UI/UI.tscn | 20 +++++++++------- 2 files changed, 38 insertions(+), 27 deletions(-) diff --git a/src/UI/GlobalToolOptions.tscn b/src/UI/GlobalToolOptions.tscn index d26e8b810..099a39cdb 100644 --- a/src/UI/GlobalToolOptions.tscn +++ b/src/UI/GlobalToolOptions.tscn @@ -6,25 +6,34 @@ [ext_resource path="res://assets/graphics/misc/pixel_perfect_off.png" type="Texture" id=4] [node name="Global Tool Options" type="PanelContainer"] -margin_left = 958.0 -margin_top = 228.0 -margin_right = 1276.0 -margin_bottom = 274.0 +margin_left = 1.0 +margin_right = 195.0 +margin_bottom = 50.0 rect_min_size = Vector2( 0, 36 ) script = ExtResource( 3 ) [node name="ScrollContainer" type="ScrollContainer" parent="."] margin_left = 7.0 margin_top = 7.0 -margin_right = 311.0 -margin_bottom = 39.0 +margin_right = 187.0 +margin_bottom = 43.0 +rect_min_size = Vector2( 36, 36 ) -[node name="GridContainer" type="GridContainer" parent="ScrollContainer"] -margin_right = 104.0 -margin_bottom = 32.0 +[node name="CenterContainer" type="CenterContainer" parent="ScrollContainer"] +margin_right = 180.0 +margin_bottom = 36.0 +size_flags_horizontal = 3 +size_flags_vertical = 3 + +[node name="GridContainer" type="GridContainer" parent="ScrollContainer/CenterContainer"] +margin_left = 38.0 +margin_top = 2.0 +margin_right = 142.0 +margin_bottom = 34.0 +size_flags_vertical = 0 columns = 3 -[node name="Horizontal" type="Button" parent="ScrollContainer/GridContainer" groups=["UIButtons"]] +[node name="Horizontal" type="Button" parent="ScrollContainer/CenterContainer/GridContainer" groups=["UIButtons"]] margin_right = 32.0 margin_bottom = 32.0 rect_min_size = Vector2( 32, 32 ) @@ -32,7 +41,7 @@ hint_tooltip = "Enable horizontal mirrored drawing" mouse_default_cursor_shape = 2 toggle_mode = true -[node name="TextureRect" type="TextureRect" parent="ScrollContainer/GridContainer/Horizontal"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/CenterContainer/GridContainer/Horizontal"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -46,7 +55,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Vertical" type="Button" parent="ScrollContainer/GridContainer" groups=["UIButtons"]] +[node name="Vertical" type="Button" parent="ScrollContainer/CenterContainer/GridContainer" groups=["UIButtons"]] margin_left = 36.0 margin_right = 68.0 margin_bottom = 32.0 @@ -55,7 +64,7 @@ hint_tooltip = "Enable vertical mirrored drawing" mouse_default_cursor_shape = 2 toggle_mode = true -[node name="TextureRect" type="TextureRect" parent="ScrollContainer/GridContainer/Vertical"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/CenterContainer/GridContainer/Vertical"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -69,7 +78,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="PixelPerfect" type="Button" parent="ScrollContainer/GridContainer" groups=["UIButtons"]] +[node name="PixelPerfect" type="Button" parent="ScrollContainer/CenterContainer/GridContainer" groups=["UIButtons"]] margin_left = 72.0 margin_right = 104.0 margin_bottom = 32.0 @@ -79,7 +88,7 @@ Makes lines smooth by removing the extra pixels on the edges" mouse_default_cursor_shape = 2 toggle_mode = true -[node name="TextureRect" type="TextureRect" parent="ScrollContainer/GridContainer/PixelPerfect"] +[node name="TextureRect" type="TextureRect" parent="ScrollContainer/CenterContainer/GridContainer/PixelPerfect"] anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 @@ -91,6 +100,6 @@ margin_bottom = 11.0 texture = ExtResource( 4 ) [connection signal="resized" from="." to="." method="_on_resized"] -[connection signal="toggled" from="ScrollContainer/GridContainer/Horizontal" to="." method="_on_Horizontal_toggled"] -[connection signal="toggled" from="ScrollContainer/GridContainer/Vertical" to="." method="_on_Vertical_toggled"] -[connection signal="toggled" from="ScrollContainer/GridContainer/PixelPerfect" to="." method="_on_PixelPerfect_toggled"] +[connection signal="toggled" from="ScrollContainer/CenterContainer/GridContainer/Horizontal" to="." method="_on_Horizontal_toggled"] +[connection signal="toggled" from="ScrollContainer/CenterContainer/GridContainer/Vertical" to="." method="_on_Vertical_toggled"] +[connection signal="toggled" from="ScrollContainer/CenterContainer/GridContainer/PixelPerfect" to="." method="_on_PixelPerfect_toggled"] diff --git a/src/UI/UI.tscn b/src/UI/UI.tscn index d00b5a03e..c2f35f899 100644 --- a/src/UI/UI.tscn +++ b/src/UI/UI.tscn @@ -342,19 +342,21 @@ margin_bottom = 716.0 margin_left = 958.0 margin_top = 8.0 margin_right = 1276.0 -margin_bottom = 99.0623 +margin_bottom = 98.0 [node name="Color Pickers" parent="DockableContainer" instance=ExtResource( 17 )] -margin_top = 123.062 -margin_bottom = 169.062 +margin_top = 122.0 +margin_bottom = 168.0 [node name="Global Tool Options" parent="DockableContainer" instance=ExtResource( 10 )] -margin_top = 193.062 -margin_bottom = 229.062 +margin_left = 958.0 +margin_top = 192.0 +margin_right = 1276.0 +margin_bottom = 242.0 [node name="Left Tool Options" type="ScrollContainer" parent="DockableContainer"] margin_left = 958.0 -margin_top = 253.062 +margin_top = 266.0 margin_right = 1107.0 margin_bottom = 574.0 __meta__ = { @@ -363,20 +365,20 @@ __meta__ = { [node name="LeftPanelContainer" type="PanelContainer" parent="DockableContainer/Left Tool Options"] margin_right = 149.0 -margin_bottom = 320.938 +margin_bottom = 308.0 rect_min_size = Vector2( 130, 0 ) size_flags_horizontal = 3 size_flags_vertical = 3 [node name="Right Tool Options" type="ScrollContainer" parent="DockableContainer"] margin_left = 1127.0 -margin_top = 253.062 +margin_top = 266.0 margin_right = 1276.0 margin_bottom = 574.0 [node name="RightPanelContainer" type="PanelContainer" parent="DockableContainer/Right Tool Options"] margin_right = 149.0 -margin_bottom = 320.938 +margin_bottom = 308.0 rect_min_size = Vector2( 130, 0 ) size_flags_horizontal = 3 size_flags_vertical = 3