From f0622ee3703c3eb6b4a7253c36586384003afed6 Mon Sep 17 00:00:00 2001 From: Luke Hubmayer-Werner Date: Sat, 18 Mar 2023 15:22:03 +1030 Subject: [PATCH] Collapse quick options menu more --- scenes/OptionPanel.tscn | 41 +++++++++++++++++++++++++---------------- scenes/RadialGame.tscn | 4 ---- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/scenes/OptionPanel.tscn b/scenes/OptionPanel.tscn index 4897673..2522b2e 100644 --- a/scenes/OptionPanel.tscn +++ b/scenes/OptionPanel.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://assets/fonts/NotoSans-Regular.ttf" type="DynamicFontData" id=1] [ext_resource path="res://scripts/OptionPanel.gd" type="Script" id=2] @@ -39,6 +39,8 @@ func _process(delta): update() " +[sub_resource type="GradientTexture2D" id=4] + [node name="OptionPanel" type="VBoxContainer"] margin_left = 2.0 margin_right = 269.0 @@ -64,8 +66,8 @@ __meta__ = { [node name="PanelContainer" type="PanelContainer" parent="."] margin_top = 38.0 margin_right = 300.0 -margin_bottom = 638.0 -rect_min_size = Vector2( 300, 600 ) +margin_bottom = 169.0 +rect_min_size = Vector2( 300, 80 ) __meta__ = { "_edit_use_anchors_": false } @@ -74,15 +76,15 @@ __meta__ = { margin_left = 7.0 margin_top = 7.0 margin_right = 293.0 -margin_bottom = 593.0 +margin_bottom = 124.0 [node name="cb_qsettings" type="CheckBox" parent="PanelContainer/VBoxContainer"] margin_right = 286.0 margin_bottom = 31.0 -pressed = true text = "Quick Settings" [node name="vbox_qsettings" type="VBoxContainer" parent="PanelContainer/VBoxContainer"] +visible = false margin_top = 35.0 margin_right = 286.0 margin_bottom = 279.0 @@ -211,14 +213,14 @@ __meta__ = { } [node name="HSeparator" type="HSeparator" parent="PanelContainer/VBoxContainer"] -margin_top = 283.0 +margin_top = 35.0 margin_right = 286.0 -margin_bottom = 287.0 +margin_bottom = 39.0 [node name="cb_graphics" type="CheckBox" parent="PanelContainer/VBoxContainer"] -margin_top = 291.0 +margin_top = 43.0 margin_right = 286.0 -margin_bottom = 322.0 +margin_bottom = 74.0 text = "Graphics" [node name="vbox_graphics" type="VBoxContainer" parent="PanelContainer/VBoxContainer"] @@ -296,19 +298,25 @@ __meta__ = { } [node name="HSeparator2" type="HSeparator" parent="PanelContainer/VBoxContainer"] -margin_top = 326.0 +margin_top = 78.0 margin_right = 286.0 -margin_bottom = 330.0 +margin_bottom = 82.0 -[node name="VidTextureRect" type="TextureRect" parent="PanelContainer/VBoxContainer" groups=[ -"VideoTexRects", -]] -margin_top = 334.0 +[node name="cb_vid" type="CheckBox" parent="PanelContainer/VBoxContainer"] +margin_top = 86.0 margin_right = 286.0 -margin_bottom = 586.0 +margin_bottom = 117.0 +text = "Show Video Here" + +[node name="VidTextureRect" type="TextureRect" parent="PanelContainer/VBoxContainer" groups=["VideoTexRects"]] +visible = false +margin_top = 369.0 +margin_right = 286.0 +margin_bottom = 609.0 rect_min_size = Vector2( 240, 240 ) size_flags_horizontal = 7 size_flags_vertical = 7 +texture = SubResource( 4 ) expand = true stretch_mode = 6 @@ -323,3 +331,4 @@ stretch_mode = 6 [connection signal="toggled" from="PanelContainer/VBoxContainer/vbox_graphics/hbox/btn_wakelock" to="." method="_on_btn_wakelock_toggled"] [connection signal="value_changed" from="PanelContainer/VBoxContainer/vbox_graphics/sl_SSX" to="." method="_on_sl_SSX_value_changed"] [connection signal="value_changed" from="PanelContainer/VBoxContainer/vbox_graphics/sl_SSY" to="." method="_on_sl_SSY_value_changed"] +[connection signal="toggled" from="PanelContainer/VBoxContainer/cb_vid" to="PanelContainer/VBoxContainer/VidTextureRect" method="set_visible"] diff --git a/scenes/RadialGame.tscn b/scenes/RadialGame.tscn index a6b7424..a0a27fb 100644 --- a/scenes/RadialGame.tscn +++ b/scenes/RadialGame.tscn @@ -83,9 +83,6 @@ _data = [ Vector2( -1, -1 ), 0.0, 0.0, 0, 0, Vector2( 0, 0 ), 2.0, 2.0, 1, 1, Ve [node name="RadialGame" type="AspectRatioContainer"] anchor_right = 1.0 anchor_bottom = 1.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="Square" type="Control" parent="."] margin_right = 1080.0 @@ -133,7 +130,6 @@ __meta__ = { [node name="Viewport" type="Viewport" parent="Square/NoteHandler"] size = Vector2( 1080, 1080 ) transparent_bg = true -usage = 1 render_target_v_flip = true script = ExtResource( 1 )