Cleaning up tabs and adding initial graphics options (not working)

scenes/ui/menus/settings_menu.tscn

@@ -1,8 +1,19 @@
-[gd_scene load_steps=3 format=3 uid="uid://4bdgwwx27m71"]
+[gd_scene load_steps=4 format=3 uid="uid://4bdgwwx27m71"]
 
 [ext_resource type="Script" uid="uid://37ftrpj14msn" path="res://scenes/ui/menus/settings_menu.gd" id="1_qwcqe"]
 [ext_resource type="Theme" uid="uid://b5q8b0l6qp1dt" path="res://resources/pause_menu_theme.tres" id="2_mhswj"]
 
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_80b2v"]
+content_margin_left = 10.0
+content_margin_top = 10.0
+content_margin_right = 10.0
+content_margin_bottom = 10.0
+bg_color = Color(0, 0, 0, 0.27451)
+corner_radius_top_left = 2
+corner_radius_top_right = 2
+corner_radius_bottom_right = 2
+corner_radius_bottom_left = 2
+
 [node name="SettingsMenu" type="Panel"]
 process_mode = 3
 anchors_preset = 15
@@ -11,6 +22,7 @@ anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 script = ExtResource("1_qwcqe")
+metadata/_edit_vertical_guides_ = [349.0]
 
 [node name="Background" type="ColorRect" parent="."]
 custom_minimum_size = Vector2(400, 0)
@@ -35,47 +47,115 @@ 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"]
+[node name="VBoxContainer" type="VBoxContainer" parent="Background/MarginContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
 theme_override_constants/separation = 20
 
-[node name="Title" type="Label" parent="Background/MarginContainer/CenterContainer"]
+[node name="Title" type="Label" parent="Background/MarginContainer/VBoxContainer"]
 layout_mode = 2
 theme_override_font_sizes/font_size = 40
 text = "Settings"
 horizontal_alignment = 1
 
-[node name="TabContainer" type="TabContainer" parent="Background/MarginContainer/CenterContainer"]
+[node name="TabContainer" type="TabContainer" parent="Background/MarginContainer/VBoxContainer"]
 layout_mode = 2
-current_tab = 0
+theme_override_constants/side_margin = 0
+theme_override_styles/panel = SubResource("StyleBoxFlat_80b2v")
+current_tab = 1
 clip_tabs = false
 
-[node name="Game" type="VBoxContainer" parent="Background/MarginContainer/CenterContainer/TabContainer"]
+[node name="Game" type="VBoxContainer" parent="Background/MarginContainer/VBoxContainer/TabContainer"]
+visible = false
 layout_mode = 2
 metadata/_tab_index = 0
 
-[node name="BlockHighlighting" type="CheckButton" parent="Background/MarginContainer/CenterContainer/TabContainer/Game"]
+[node name="BlockHighlight" type="HBoxContainer" parent="Background/MarginContainer/VBoxContainer/TabContainer/Game"]
 layout_mode = 2
-button_pressed = true
+
+[node name="Label" type="Label" parent="Background/MarginContainer/VBoxContainer/TabContainer/Game/BlockHighlight"]
+layout_mode = 2
+size_flags_horizontal = 3
 text = "Enable Block Highlighting"
 
-[node name="EnableWaila" type="CheckButton" parent="Background/MarginContainer/CenterContainer/TabContainer/Game"]
+[node name="CheckButton" type="CheckButton" parent="Background/MarginContainer/VBoxContainer/TabContainer/Game/BlockHighlight"]
 layout_mode = 2
 button_pressed = true
+
+[node name="Waila" type="HBoxContainer" parent="Background/MarginContainer/VBoxContainer/TabContainer/Game"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="Background/MarginContainer/VBoxContainer/TabContainer/Game/Waila"]
+layout_mode = 2
+size_flags_horizontal = 3
 text = "Enable Waila"
 
-[node name="Graphics" type="VBoxContainer" parent="Background/MarginContainer/CenterContainer/TabContainer"]
-visible = false
+[node name="CheckButton" type="CheckButton" parent="Background/MarginContainer/VBoxContainer/TabContainer/Game/Waila"]
+layout_mode = 2
+button_pressed = true
+
+[node name="Graphics" type="VBoxContainer" parent="Background/MarginContainer/VBoxContainer/TabContainer"]
 layout_mode = 2
 metadata/_tab_index = 1
 
-[node name="Audio" type="VBoxContainer" parent="Background/MarginContainer/CenterContainer/TabContainer"]
+[node name="Resolution" type="HBoxContainer" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics/Resolution"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Resolution"
+
+[node name="OptionButton" type="OptionButton" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics/Resolution"]
+layout_mode = 2
+selected = 0
+item_count = 3
+popup/item_0/text = "1280x720"
+popup/item_0/id = 0
+popup/item_1/text = "1920x1080"
+popup/item_1/id = 1
+popup/item_2/text = "2560x1440"
+popup/item_2/id = 2
+
+[node name="Fullscreen" type="HBoxContainer" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics/Fullscreen"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "Fullscreen"
+
+[node name="CheckBox" type="CheckBox" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics/Fullscreen"]
+layout_mode = 2
+
+[node name="VSync" type="HBoxContainer" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics"]
+layout_mode = 2
+
+[node name="Label" type="Label" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics/VSync"]
+layout_mode = 2
+size_flags_horizontal = 3
+text = "VSync"
+
+[node name="CheckBox" type="CheckBox" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics/VSync"]
+layout_mode = 2
+
+[node name="HSeparator" type="HSeparator" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics"]
+layout_mode = 2
+theme_override_constants/separation = 20
+
+[node name="CenterContainer" type="CenterContainer" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics"]
+layout_mode = 2
+
+[node name="ApplyButton" type="Button" parent="Background/MarginContainer/VBoxContainer/TabContainer/Graphics/CenterContainer"]
+layout_mode = 2
+text = "Apply"
+
+[node name="Audio" type="VBoxContainer" parent="Background/MarginContainer/VBoxContainer/TabContainer"]
 visible = false
 layout_mode = 2
 metadata/_tab_index = 2
 
-[node name="Inputs" type="VBoxContainer" parent="Background/MarginContainer/CenterContainer/TabContainer"]
+[node name="Inputs" type="VBoxContainer" parent="Background/MarginContainer/VBoxContainer/TabContainer"]
 visible = false
 layout_mode = 2
 metadata/_tab_index = 3
@@ -100,6 +180,6 @@ layout_mode = 2
 theme = ExtResource("2_mhswj")
 text = "Close Settings"
 
-[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="toggled" from="Background/MarginContainer/VBoxContainer/TabContainer/Game/BlockHighlight/CheckButton" to="." method="_on_block_highlighting_toggled"]
+[connection signal="toggled" from="Background/MarginContainer/VBoxContainer/TabContainer/Game/Waila/CheckButton" to="." method="_on_enable_waila_toggled"]
 [connection signal="pressed" from="Background/BottomRow/CloseButton" to="." method="_on_close_button_pressed"]