Mirroring look of Settings and Pause menus

scenes/ui/menus/pause_menu.tscn

@@ -13,7 +13,7 @@ grow_vertical = 2
 theme = ExtResource("1_6tw0m")
 script = ExtResource("2_0lmf7")
 
-[node name="MenuBody" type="ColorRect" parent="."]
+[node name="Background" type="ColorRect" parent="."]
 custom_minimum_size = Vector2(400, 0)
 layout_mode = 1
 anchors_preset = 13
@@ -24,7 +24,7 @@ grow_horizontal = 2
 grow_vertical = 2
 color = Color(0.192157, 0.239216, 0.352941, 1)
 
-[node name="MarginContainer" type="MarginContainer" parent="MenuBody"]
+[node name="MarginContainer" type="MarginContainer" parent="Background"]
 layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
@@ -36,45 +36,45 @@ theme_override_constants/margin_top = 10
 theme_override_constants/margin_right = 10
 theme_override_constants/margin_bottom = 10
 
-[node name="CenterContainer" type="VBoxContainer" parent="MenuBody/MarginContainer"]
+[node name="CenterContainer" type="VBoxContainer" parent="Background/MarginContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
 theme_override_constants/separation = 20
 
-[node name="Title" type="Label" parent="MenuBody/MarginContainer/CenterContainer"]
+[node name="Title" type="Label" parent="Background/MarginContainer/CenterContainer"]
 layout_mode = 2
 theme_override_font_sizes/font_size = 40
 text = "Paused"
 horizontal_alignment = 1
 vertical_alignment = 1
 
-[node name="ButtonsContainer" type="VBoxContainer" parent="MenuBody/MarginContainer/CenterContainer"]
+[node name="ButtonsContainer" type="VBoxContainer" parent="Background/MarginContainer/CenterContainer"]
 layout_mode = 2
 size_flags_vertical = 6
 theme_override_constants/separation = 20
 
-[node name="ResumeButton" type="Button" parent="MenuBody/MarginContainer/CenterContainer/ButtonsContainer"]
+[node name="ResumeButton" type="Button" parent="Background/MarginContainer/CenterContainer/ButtonsContainer"]
 layout_mode = 2
 text = "Resume"
 
-[node name="QuickSave" type="Button" parent="MenuBody/MarginContainer/CenterContainer/ButtonsContainer"]
+[node name="QuickSave" type="Button" parent="Background/MarginContainer/CenterContainer/ButtonsContainer"]
 layout_mode = 2
 text = "Quick Save"
 
-[node name="QuickLoad" type="Button" parent="MenuBody/MarginContainer/CenterContainer/ButtonsContainer"]
+[node name="QuickLoad" type="Button" parent="Background/MarginContainer/CenterContainer/ButtonsContainer"]
 layout_mode = 2
 text = "Quick Load"
 
-[node name="SettingsButton" type="Button" parent="MenuBody/MarginContainer/CenterContainer/ButtonsContainer"]
+[node name="SettingsButton" type="Button" parent="Background/MarginContainer/CenterContainer/ButtonsContainer"]
 layout_mode = 2
 text = "Settings"
 
-[node name="ExitGameButton" type="Button" parent="MenuBody/MarginContainer/CenterContainer/ButtonsContainer"]
+[node name="ExitGameButton" type="Button" parent="Background/MarginContainer/CenterContainer/ButtonsContainer"]
 layout_mode = 2
 text = "Exit Game"
 
-[connection signal="pressed" from="MenuBody/MarginContainer/CenterContainer/ButtonsContainer/ResumeButton" to="." method="_on_resume_button_pressed"]
-[connection signal="pressed" from="MenuBody/MarginContainer/CenterContainer/ButtonsContainer/QuickSave" to="." method="_on_quick_save_pressed"]
-[connection signal="pressed" from="MenuBody/MarginContainer/CenterContainer/ButtonsContainer/QuickLoad" to="." method="_on_quick_load_pressed"]
-[connection signal="pressed" from="MenuBody/MarginContainer/CenterContainer/ButtonsContainer/SettingsButton" to="." method="_on_settings_button_pressed"]
-[connection signal="pressed" from="MenuBody/MarginContainer/CenterContainer/ButtonsContainer/ExitGameButton" to="." method="_on_exit_game_button_pressed"]
+[connection signal="pressed" from="Background/MarginContainer/CenterContainer/ButtonsContainer/ResumeButton" to="." method="_on_resume_button_pressed"]
+[connection signal="pressed" from="Background/MarginContainer/CenterContainer/ButtonsContainer/QuickSave" to="." method="_on_quick_save_pressed"]
+[connection signal="pressed" from="Background/MarginContainer/CenterContainer/ButtonsContainer/QuickLoad" to="." method="_on_quick_load_pressed"]
+[connection signal="pressed" from="Background/MarginContainer/CenterContainer/ButtonsContainer/SettingsButton" to="." method="_on_settings_button_pressed"]
+[connection signal="pressed" from="Background/MarginContainer/CenterContainer/ButtonsContainer/ExitGameButton" to="." method="_on_exit_game_button_pressed"]

scenes/ui/menus/settings_menu.tscn

@@ -12,64 +12,75 @@ grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_qwcqe")
 
-[node name="MarginContainer" type="MarginContainer" parent="."]
+[node name="Background" type="ColorRect" parent="."]
+custom_minimum_size = Vector2(400, 0)
 layout_mode = 1
-anchors_preset = 5
+anchors_preset = 13
 anchor_left = 0.5
 anchor_right = 0.5
-offset_left = -300.0
-offset_right = 300.0
-offset_bottom = 137.0
+anchor_bottom = 1.0
 grow_horizontal = 2
-theme_override_constants/margin_left = 20
-theme_override_constants/margin_top = 20
-theme_override_constants/margin_right = 20
-theme_override_constants/margin_bottom = 20
+grow_vertical = 2
+color = Color(0.192157, 0.239216, 0.352941, 1)
 
-[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
+[node name="MarginContainer" type="MarginContainer" parent="Background"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+theme_override_constants/margin_left = 10
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_right = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="CenterContainer" type="VBoxContainer" parent="Background/MarginContainer"]
 layout_mode = 2
+size_flags_horizontal = 4
 theme_override_constants/separation = 20
 
-[node name="Title" type="Label" parent="MarginContainer/VBoxContainer"]
+[node name="Title" type="Label" parent="Background/MarginContainer/CenterContainer"]
 layout_mode = 2
 theme_override_font_sizes/font_size = 40
 text = "Settings"
 horizontal_alignment = 1
 
-[node name="TabContainer" type="TabContainer" parent="MarginContainer/VBoxContainer"]
+[node name="TabContainer" type="TabContainer" parent="Background/MarginContainer/CenterContainer"]
 layout_mode = 2
 current_tab = 0
+clip_tabs = false
 
-[node name="Game" type="VBoxContainer" parent="MarginContainer/VBoxContainer/TabContainer"]
+[node name="Game" type="VBoxContainer" parent="Background/MarginContainer/CenterContainer/TabContainer"]
 layout_mode = 2
 metadata/_tab_index = 0
 
-[node name="BlockHighlighting" type="CheckButton" parent="MarginContainer/VBoxContainer/TabContainer/Game"]
+[node name="BlockHighlighting" type="CheckButton" parent="Background/MarginContainer/CenterContainer/TabContainer/Game"]
 layout_mode = 2
 button_pressed = true
 text = "Enable Block Highlighting"
 
-[node name="EnableWaila" type="CheckButton" parent="MarginContainer/VBoxContainer/TabContainer/Game"]
+[node name="EnableWaila" type="CheckButton" parent="Background/MarginContainer/CenterContainer/TabContainer/Game"]
 layout_mode = 2
 button_pressed = true
 text = "Enable Waila"
 
-[node name="Graphics (Todo)" type="VBoxContainer" parent="MarginContainer/VBoxContainer/TabContainer"]
+[node name="Graphics" type="VBoxContainer" parent="Background/MarginContainer/CenterContainer/TabContainer"]
 visible = false
 layout_mode = 2
 metadata/_tab_index = 1
 
-[node name="Audio (TODO)" type="VBoxContainer" parent="MarginContainer/VBoxContainer/TabContainer"]
+[node name="Audio" type="VBoxContainer" parent="Background/MarginContainer/CenterContainer/TabContainer"]
 visible = false
 layout_mode = 2
 metadata/_tab_index = 2
 
-[node name="Inputs (TODO)" type="VBoxContainer" parent="MarginContainer/VBoxContainer/TabContainer"]
+[node name="Inputs" type="VBoxContainer" parent="Background/MarginContainer/CenterContainer/TabContainer"]
 visible = false
 layout_mode = 2
 metadata/_tab_index = 3
 
-[node name="BottomRow" type="MarginContainer" parent="."]
+[node name="BottomRow" type="MarginContainer" parent="Background"]
 layout_mode = 1
 anchors_preset = 7
 anchor_left = 0.5
@@ -77,22 +88,18 @@ anchor_top = 1.0
 anchor_right = 0.5
 anchor_bottom = 1.0
 offset_left = -82.5
-offset_top = -40.0
+offset_top = -46.0
 offset_right = 82.5
 grow_horizontal = 2
 grow_vertical = 0
 theme_override_constants/margin_bottom = 10
 
-[node name="HBoxContainer" type="HBoxContainer" parent="BottomRow"]
-layout_mode = 2
-theme_override_constants/separation = 20
-
-[node name="CloseButton" type="Button" parent="BottomRow/HBoxContainer"]
+[node name="CloseButton" type="Button" parent="Background/BottomRow"]
 custom_minimum_size = Vector2(141, 36)
 layout_mode = 2
 theme = ExtResource("2_mhswj")
 text = "Close Settings"
 
-[connection signal="toggled" from="MarginContainer/VBoxContainer/TabContainer/Game/BlockHighlighting" to="." method="_on_block_highlighting_toggled"]
-[connection signal="toggled" from="MarginContainer/VBoxContainer/TabContainer/Game/EnableWaila" to="." method="_on_enable_waila_toggled"]
-[connection signal="pressed" from="BottomRow/HBoxContainer/CloseButton" to="." method="_on_close_button_pressed"]
+[connection signal="toggled" from="Background/MarginContainer/CenterContainer/TabContainer/Game/BlockHighlighting" to="." method="_on_block_highlighting_toggled"]
+[connection signal="toggled" from="Background/MarginContainer/CenterContainer/TabContainer/Game/EnableWaila" to="." method="_on_enable_waila_toggled"]
+[connection signal="pressed" from="Background/BottomRow/CloseButton" to="." method="_on_close_button_pressed"]