From a7f32d70027cfe8715f0550a1cdfa6f410eaeab2 Mon Sep 17 00:00:00 2001 From: Maaack Date: Thu, 30 Nov 2023 15:27:05 -0800 Subject: [PATCH] Makes sizes of buttons more consistent. --- App/Scenes/Menus/MainMenu/MainMenu.tscn | 13 +++++++++++-- App/Scenes/Menus/PauseMenu/PauseMenu.tscn | 22 +++++++++++++++++++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/App/Scenes/Menus/MainMenu/MainMenu.tscn b/App/Scenes/Menus/MainMenu/MainMenu.tscn index 16f75db..2e5f2d2 100644 --- a/App/Scenes/Menus/MainMenu/MainMenu.tscn +++ b/App/Scenes/Menus/MainMenu/MainMenu.tscn @@ -349,7 +349,6 @@ layout_mode = 2 [node name="TitlesMargin" type="MarginContainer" parent="MarginContainer/VBoxContainer"] layout_mode = 2 theme_override_constants/margin_top = 16 -theme_override_constants/margin_bottom = 16 [node name="TitlesContainer" type="VBoxContainer" parent="MarginContainer/VBoxContainer/TitlesMargin"] layout_mode = 2 @@ -365,7 +364,7 @@ vertical_alignment = 1 [node name="SubTitle" type="Label" parent="MarginContainer/VBoxContainer/TitlesMargin/TitlesContainer"] modulate = Color(1, 1, 1, 0) layout_mode = 2 -theme_override_font_sizes/font_size = 32 +theme_override_font_sizes/font_size = 24 text = "Subtitle" horizontal_alignment = 1 vertical_alignment = 1 @@ -380,27 +379,36 @@ theme_override_constants/margin_bottom = 16 unique_name_in_owner = true modulate = Color(1, 1, 1, 0) layout_mode = 2 +theme_override_constants/separation = 16 alignment = 1 script = ExtResource("4_l1ebe") [node name="PlayButton" parent="MarginContainer/VBoxContainer/MenuMargin/MenuButtons" instance=ExtResource("5")] unique_name_in_owner = true +custom_minimum_size = Vector2(128, 40) layout_mode = 2 +size_flags_horizontal = 4 text = "Play" [node name="OptionsButton" parent="MarginContainer/VBoxContainer/MenuMargin/MenuButtons" instance=ExtResource("5")] unique_name_in_owner = true +custom_minimum_size = Vector2(128, 40) layout_mode = 2 +size_flags_horizontal = 4 text = "Options" [node name="CreditsButton" parent="MarginContainer/VBoxContainer/MenuMargin/MenuButtons" instance=ExtResource("5")] unique_name_in_owner = true +custom_minimum_size = Vector2(128, 40) layout_mode = 2 +size_flags_horizontal = 4 text = "Credits" [node name="ExitButton" parent="MarginContainer/VBoxContainer/MenuMargin/MenuButtons" instance=ExtResource("5")] unique_name_in_owner = true +custom_minimum_size = Vector2(128, 40) layout_mode = 2 +size_flags_horizontal = 4 text = "Exit" [node name="OptionsContainer" type="MarginContainer" parent="."] @@ -441,6 +449,7 @@ mouse_filter = 2 [node name="BackButton" parent="FlowControlContainer/FlowControl" instance=ExtResource("5")] unique_name_in_owner = true visible = false +custom_minimum_size = Vector2(62, 40) layout_mode = 0 anchor_top = 1.0 anchor_bottom = 1.0 diff --git a/App/Scenes/Menus/PauseMenu/PauseMenu.tscn b/App/Scenes/Menus/PauseMenu/PauseMenu.tscn index 544bc02..889b0b2 100644 --- a/App/Scenes/Menus/PauseMenu/PauseMenu.tscn +++ b/App/Scenes/Menus/PauseMenu/PauseMenu.tscn @@ -41,39 +41,54 @@ grow_vertical = 2 [node name="VBoxContainer" type="VBoxContainer" parent="Control/MenuContainer"] layout_mode = 2 -[node name="Title" type="Label" parent="Control/MenuContainer/VBoxContainer"] +[node name="MarginContainer" type="MarginContainer" parent="Control/MenuContainer/VBoxContainer"] layout_mode = 2 +theme_override_constants/margin_top = 16 + +[node name="Title" type="Label" parent="Control/MenuContainer/VBoxContainer/MarginContainer"] +layout_mode = 2 +theme_override_font_sizes/font_size = 24 text = "Pause" horizontal_alignment = 1 [node name="MenuButtons" type="VBoxContainer" parent="Control/MenuContainer/VBoxContainer"] layout_mode = 2 size_flags_vertical = 3 -theme_override_constants/separation = 24 +theme_override_constants/separation = 16 alignment = 1 script = ExtResource("3_43rgy") [node name="ResumeButton" parent="Control/MenuContainer/VBoxContainer/MenuButtons" instance=ExtResource("4")] +custom_minimum_size = Vector2(128, 40) layout_mode = 2 +size_flags_horizontal = 4 text = "Resume" [node name="RestartButton" parent="Control/MenuContainer/VBoxContainer/MenuButtons" instance=ExtResource("4")] +custom_minimum_size = Vector2(128, 40) layout_mode = 2 +size_flags_horizontal = 4 text = "Restart" [node name="OptionsButton" parent="Control/MenuContainer/VBoxContainer/MenuButtons" instance=ExtResource("4")] unique_name_in_owner = true +custom_minimum_size = Vector2(128, 40) layout_mode = 2 +size_flags_horizontal = 4 text = "Options" [node name="MainMenuButton" parent="Control/MenuContainer/VBoxContainer/MenuButtons" instance=ExtResource("4")] unique_name_in_owner = true +custom_minimum_size = Vector2(128, 40) layout_mode = 2 -text = "Return to Main Menu" +size_flags_horizontal = 4 +text = "Main Menu" [node name="ExitButton" parent="Control/MenuContainer/VBoxContainer/MenuButtons" instance=ExtResource("4")] unique_name_in_owner = true +custom_minimum_size = Vector2(128, 40) layout_mode = 2 +size_flags_horizontal = 4 text = "Exit Game" [node name="CenterContainer" type="CenterContainer" parent="Control"] @@ -102,6 +117,7 @@ layout_mode = 2 alignment = 1 [node name="BackButton" type="Button" parent="Control/CenterContainer/SubMenuContainer/HBoxContainer"] +custom_minimum_size = Vector2(62, 40) layout_mode = 2 text = "Back"