Merge pull request #7 from Maaack/better-ui-spacing

Better UI spacing
Maaack · Dec 1, 2023 · 78c3ee8 · 78c3ee8
2 parents 3389582 + 4c4213f
commit 78c3ee8
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 23 deletions.
diff --git a/App/Scenes/Menus/OptionsMenu/Audio/AudioOptionsMenu.tscn b/App/Scenes/Menus/OptionsMenu/Audio/AudioOptionsMenu.tscn
@@ -11,8 +11,8 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme_override_constants/margin_top = 16
-theme_override_constants/margin_bottom = 16
+theme_override_constants/margin_top = 24
+theme_override_constants/margin_bottom = 24
 script = ExtResource("1")
 audio_control_scene = ExtResource("2_0jh6g")
 

diff --git a/App/Scenes/Menus/OptionsMenu/Input/InputOptionsMenu.tscn b/App/Scenes/Menus/OptionsMenu/Input/InputOptionsMenu.tscn
@@ -16,8 +16,8 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-theme_override_constants/margin_top = 16
-theme_override_constants/margin_bottom = 16
+theme_override_constants/margin_top = 24
+theme_override_constants/margin_bottom = 24
 script = ExtResource("1")
 add_button_texture = SubResource("PlaceholderTexture2D_7h8wy")
 remove_button_texture = SubResource("PlaceholderTexture2D_nq02i")

diff --git a/App/Scenes/Menus/OptionsMenu/OptionsMenu.tscn b/App/Scenes/Menus/OptionsMenu/OptionsMenu.tscn
@@ -5,17 +5,21 @@
 [ext_resource type="Script" path="res://App/Scripts/CaptureFocus.gd" id="3_xfg0m"]
 
 [node name="OptionsMenu" type="VBoxContainer"]
-custom_minimum_size = Vector2(305, 260)
+custom_minimum_size = Vector2(400, 260)
 anchors_preset = 8
 anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-offset_left = -152.5
-offset_top = -150.0
-offset_right = 152.5
-offset_bottom = 110.0
+offset_left = -200.0
+offset_top = -130.0
+offset_right = 200.0
+offset_bottom = 130.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 4
 theme_override_constants/separation = 8
+alignment = 1
 script = ExtResource("2")
 audio_control_scene = ExtResource("2_xrxr1")
 

diff --git a/App/Scenes/Menus/OptionsMenu/Video/VideoOptionsMenu.tscn b/App/Scenes/Menus/OptionsMenu/Video/VideoOptionsMenu.tscn
@@ -7,8 +7,8 @@
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-theme_override_constants/margin_top = 16
-theme_override_constants/margin_bottom = 16
+theme_override_constants/margin_top = 24
+theme_override_constants/margin_bottom = 24
 script = ExtResource("1")
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]

diff --git a/App/Scenes/Menus/PauseMenu/PauseMenu.tscn b/App/Scenes/Menus/PauseMenu/PauseMenu.tscn
@@ -91,32 +91,33 @@ layout_mode = 2
 size_flags_horizontal = 4
 text = "Exit Game"
 
-[node name="CenterContainer" type="CenterContainer" parent="Control"]
+[node name="SubMenuContainer" type="MarginContainer" parent="Control"]
+unique_name_in_owner = true
+visible = false
+custom_minimum_size = Vector2(360, 360)
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
-mouse_filter = 2
+theme_override_constants/margin_top = 24
+theme_override_constants/margin_bottom = 24
 
-[node name="SubMenuContainer" type="VBoxContainer" parent="Control/CenterContainer"]
-unique_name_in_owner = true
-visible = false
-custom_minimum_size = Vector2(360, 360)
+[node name="VBoxContainer" type="VBoxContainer" parent="Control/SubMenuContainer"]
 layout_mode = 2
 theme_override_constants/separation = 8
 
-[node name="OptionsContainer" type="MarginContainer" parent="Control/CenterContainer/SubMenuContainer"]
+[node name="OptionsContainer" type="MarginContainer" parent="Control/SubMenuContainer/VBoxContainer"]
 unique_name_in_owner = true
 layout_mode = 2
 size_flags_vertical = 3
 
-[node name="HBoxContainer" type="HBoxContainer" parent="Control/CenterContainer/SubMenuContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="Control/SubMenuContainer/VBoxContainer"]
 layout_mode = 2
 alignment = 1
 
-[node name="BackButton" type="Button" parent="Control/CenterContainer/SubMenuContainer/HBoxContainer"]
+[node name="BackButton" type="Button" parent="Control/SubMenuContainer/VBoxContainer/HBoxContainer"]
 custom_minimum_size = Vector2(62, 40)
 layout_mode = 2
 text = "Back"
@@ -138,7 +139,7 @@ dialog_text = "Quit the game?"
 [connection signal="pressed" from="Control/MenuContainer/VBoxContainer/MenuButtons/OptionsButton" to="." method="_on_options_button_pressed"]
 [connection signal="pressed" from="Control/MenuContainer/VBoxContainer/MenuButtons/MainMenuButton" to="." method="_on_main_menu_button_pressed"]
 [connection signal="pressed" from="Control/MenuContainer/VBoxContainer/MenuButtons/ExitButton" to="." method="_on_exit_button_pressed"]
-[connection signal="pressed" from="Control/CenterContainer/SubMenuContainer/HBoxContainer/BackButton" to="." method="_on_back_button_pressed"]
+[connection signal="pressed" from="Control/SubMenuContainer/VBoxContainer/HBoxContainer/BackButton" to="." method="_on_back_button_pressed"]
 [connection signal="confirmed" from="Control/ConfirmRestart" to="." method="_on_confirm_restart_confirmed"]
 [connection signal="confirmed" from="Control/ConfirmMainMenu" to="." method="_on_confirm_main_menu_confirmed"]
 [connection signal="confirmed" from="Control/ConfirmExit" to="." method="_on_confirm_exit_confirmed"]
diff --git a/Extras/Scenes/Menus/OptionsMenu/Game/GameOptionsMenu.tscn b/Extras/Scenes/Menus/OptionsMenu/Game/GameOptionsMenu.tscn
@@ -8,8 +8,8 @@
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
-theme_override_constants/margin_top = 16
-theme_override_constants/margin_bottom = 16
+theme_override_constants/margin_top = 24
+theme_override_constants/margin_bottom = 24
 script = ExtResource("1")
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]