From 00e1dbe2a643167f79623af7f26b7e7c99e4f663 Mon Sep 17 00:00:00 2001 From: Ryan Reed Date: Sat, 8 Mar 2025 16:36:19 -0500 Subject: [PATCH] Updating UI layout and adding controls --- scenes/ui/options_menu.tscn | 45 ++++++++++++++++++++++++++++++------- scenes/ui/ui.tscn | 4 ++-- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/scenes/ui/options_menu.tscn b/scenes/ui/options_menu.tscn index 0f0a976..555cb01 100644 --- a/scenes/ui/options_menu.tscn +++ b/scenes/ui/options_menu.tscn @@ -17,30 +17,58 @@ theme_override_constants/margin_top = 20 theme_override_constants/margin_right = 20 theme_override_constants/margin_bottom = 20 -[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer"] +[node name="LeftContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer"] layout_mode = 2 -[node name="Label" type="Label" parent="PanelContainer/MarginContainer/VBoxContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer/LeftContainer"] layout_mode = 2 +size_flags_horizontal = 3 + +[node name="Label" type="Label" parent="PanelContainer/MarginContainer/LeftContainer/VBoxContainer"] +layout_mode = 2 +size_flags_vertical = 0 theme_type_variation = &"HeaderMedium" text = "Options Menu" horizontal_alignment = 1 -[node name="Waila" type="HBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"] +[node name="BlockHighlights" type="HBoxContainer" parent="PanelContainer/MarginContainer/LeftContainer/VBoxContainer"] layout_mode = 2 -[node name="CheckButton" type="CheckButton" parent="PanelContainer/MarginContainer/VBoxContainer/Waila"] +[node name="CheckButton" type="CheckButton" parent="PanelContainer/MarginContainer/LeftContainer/VBoxContainer/BlockHighlights"] layout_mode = 2 button_pressed = true -text = "Enable Waila" +text = "Enable Block Highlighting" -[node name="BlockHighlights" type="HBoxContainer" parent="PanelContainer/MarginContainer/VBoxContainer"] +[node name="Waila" type="HBoxContainer" parent="PanelContainer/MarginContainer/LeftContainer/VBoxContainer"] layout_mode = 2 -[node name="CheckButton" type="CheckButton" parent="PanelContainer/MarginContainer/VBoxContainer/BlockHighlights"] +[node name="CheckButton" type="CheckButton" parent="PanelContainer/MarginContainer/LeftContainer/VBoxContainer/Waila"] layout_mode = 2 button_pressed = true -text = "Enable Block Highlighting" +text = "Enable Waila" + +[node name="BottomRightContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer"] +layout_mode = 2 +size_flags_horizontal = 8 +size_flags_vertical = 8 + +[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/MarginContainer/BottomRightContainer"] +layout_mode = 2 +size_flags_horizontal = 8 + +[node name="ControlsLabel" type="Label" parent="PanelContainer/MarginContainer/BottomRightContainer/VBoxContainer"] +layout_mode = 2 +theme_type_variation = &"HeaderSmall" +text = "Controls" +horizontal_alignment = 1 + +[node name="Controls" type="Label" parent="PanelContainer/MarginContainer/BottomRightContainer/VBoxContainer"] +layout_mode = 2 +text = "Left Click - Create Block +Right Click - Delete Block +Scoll Wheel - Change Block +Ctrl - Crouch +Shift - Sprint (until stop or toggled)" [node name="CenterContainer" type="CenterContainer" parent="PanelContainer/MarginContainer"] layout_mode = 2 @@ -48,6 +76,7 @@ size_flags_vertical = 8 [node name="HBoxContainer" type="HBoxContainer" parent="PanelContainer/MarginContainer/CenterContainer"] layout_mode = 2 +theme_override_constants/separation = 10 [node name="CloseButton" type="Button" parent="PanelContainer/MarginContainer/CenterContainer/HBoxContainer"] layout_mode = 2 diff --git a/scenes/ui/ui.tscn b/scenes/ui/ui.tscn index f200f20..df6740d 100644 --- a/scenes/ui/ui.tscn +++ b/scenes/ui/ui.tscn @@ -32,8 +32,8 @@ visible = false [node name="QuickSlots" parent="." instance=ExtResource("4_g5kmx")] -[connection signal="toggled" from="OptionsMenu/PanelContainer/MarginContainer/VBoxContainer/Waila/CheckButton" to="." method="_on_waila_toggled"] -[connection signal="toggled" from="OptionsMenu/PanelContainer/MarginContainer/VBoxContainer/BlockHighlights/CheckButton" to="." method="_on_block_highlights_toggled"] +[connection signal="toggled" from="OptionsMenu/PanelContainer/MarginContainer/LeftContainer/VBoxContainer/BlockHighlights/CheckButton" to="." method="_on_block_highlights_toggled"] +[connection signal="toggled" from="OptionsMenu/PanelContainer/MarginContainer/LeftContainer/VBoxContainer/Waila/CheckButton" to="." method="_on_waila_toggled"] [connection signal="pressed" from="OptionsMenu/PanelContainer/MarginContainer/CenterContainer/HBoxContainer/CloseButton" to="." method="_on_close_button_pressed"] [connection signal="pressed" from="OptionsMenu/PanelContainer/MarginContainer/CenterContainer/HBoxContainer/ExitButton" to="." method="_on_exit_button_pressed"]