kawaiizenbo/PneumaticPlaything
1
0
Fork 0
Code Issues Pull requests Projects Releases 9 Packages Wiki Activity Actions

add theming support, fix ui issues, add ui scaling option

Browse source
This commit is contained in:
Persephone Bubblegum-Holiday 2025-08-13 00:21:27 -07:00
parent 61806723ba
commit 1ced41d096
18 changed files with 259 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Scenes/GUI/Controls/MovementFrameIndicatorOff.tscn
View file

@ -6,6 +6,7 @@
layout_mode = 3
anchors_preset = 0
script = ExtResource("1_ttcva")
color = "MovementOff"
[node name="ColorRect" type="ColorRect" parent="."]
layout_mode = 0

1
Scenes/GUI/Controls/MovementFrameIndicatorOn.tscn
View file

@ -6,6 +6,7 @@
layout_mode = 3
anchors_preset = 0
script = ExtResource("1_2om8h")
color = "MovementOn"
[node name="ColorRect" type="ColorRect" parent="."]
layout_mode = 0

12
Scenes/GUI/Controls/MovementRow.tscn
View file

@ -1,9 +1,8 @@
[gd_scene load_steps=7 format=3 uid="uid://dtkqaw5533rxy"]
[gd_scene load_steps=6 format=3 uid="uid://dtkqaw5533rxy"]
[ext_resource type="StyleBox" uid="uid://d17amc25o63p1" path="res://UI/Themes/MovementsPanelOverride.tres" id="1_d1xev"]
[ext_resource type="Script" uid="uid://tn3aaldu7mm2" path="res://Scripts/MovementRow.gd" id="1_rm5t0"]
[ext_resource type="Texture2D" uid="uid://cn5xdrxdv622h" path="res://UI/SmallX.png" id="2_e7anl"]
[ext_resource type="Texture2D" uid="uid://d007317123e27" path="res://UI/SmallLock.png" id="3_ldhn8"]
[ext_resource type="Texture2D" uid="uid://cn5xdrxdv622h" path="res://UI/TransportControls/SmallX.png" id="2_e7anl"]
[ext_resource type="Texture2D" uid="uid://d007317123e27" path="res://UI/TransportControls/SmallLock.png" id="3_ldhn8"]
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_rm5t0"]
bg_color = Color(0, 1, 0, 1)
@ -71,7 +70,7 @@ theme_override_styles/pressed = SubResource("StyleBoxFlat_ldhn8")
toggle_mode = true
icon = ExtResource("3_ldhn8")
[node name="MovementsBG" type="Panel" parent="."]
[node name="MovementsBG" type="ColorRect" parent="."]
layout_mode = 1
anchors_preset = -1
anchor_right = 1.0
@ -79,7 +78,8 @@ anchor_bottom = 1.0
offset_left = 264.0
grow_horizontal = 2
grow_vertical = 2
theme_override_styles/panel = ExtResource("1_d1xev")
theme_type_variation = &"MovementBG"
color = Color(0.0941176, 0.0941176, 0.0941176, 1)
[node name="InvisibleMask" type="Control" parent="MovementsBG"]
clip_contents = true

4
Scenes/GUI/EditorScreen.tscn
View file

@ -1,7 +1,6 @@
[gd_scene load_steps=26 format=3 uid="uid://oiehbor0dlqx"]
[gd_scene load_steps=25 format=3 uid="uid://oiehbor0dlqx"]
[ext_resource type="Script" uid="uid://dfiwoln8mdwm8" path="res://Scripts/EditorScreen.gd" id="1_sd512"]
[ext_resource type="Theme" uid="uid://dbgs4id7y5d1c" path="res://UI/Themes/Dark.tres" id="1_v0ton"]
[ext_resource type="Texture2D" uid="uid://xllpr3qc064c" path="res://UI/TransportControls/Play.png" id="3_g6u4d"]
[ext_resource type="Texture2D" uid="uid://dgacnkv2dc65s" path="res://UI/TransportControls/PlayBackwards.png" id="3_mr8sb"]
[ext_resource type="Texture2D" uid="uid://dts4eh6hyt8p3" path="res://UI/TransportControls/SkipBackwards.png" id="3_r4ytj"]
@ -46,7 +45,6 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
theme = ExtResource("1_v0ton")
script = ExtResource("1_sd512")
[node name="OpenAudioFileDialog" type="FileDialog" parent="."]

4
Scenes/GUI/InGameMenu.tscn
View file

@ -1,7 +1,6 @@
[gd_scene load_steps=17 format=3 uid="uid://cd67bfok34xhy"]
[gd_scene load_steps=16 format=3 uid="uid://cd67bfok34xhy"]
[ext_resource type="Script" uid="uid://pwg37gka2qr4" path="res://Scripts/InGameMenu.gd" id="1_cp535"]
[ext_resource type="Theme" uid="uid://dbgs4id7y5d1c" path="res://UI/Themes/Dark.tres" id="1_fxnf3"]
[ext_resource type="Texture2D" uid="uid://cttgtbu1xllwq" path="res://UI/TransportControls/Stop.png" id="3_5t5ap"]
[ext_resource type="Texture2D" uid="uid://bwhgy4u37jmo1" path="res://UI/TransportControls/Pause.png" id="4_j5gkc"]
[ext_resource type="Texture2D" uid="uid://xllpr3qc064c" path="res://UI/TransportControls/Play.png" id="5_4hvdi"]
@ -35,7 +34,6 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
theme = ExtResource("1_fxnf3")
script = ExtResource("1_cp535")
[node name="BG" type="ColorRect" parent="."]

106
Scenes/GUI/MainMenu.tscn
View file

@ -1,13 +1,13 @@
[gd_scene load_steps=21 format=3 uid="uid://1ikkb4b8mw1w"]
[ext_resource type="Theme" uid="uid://dbgs4id7y5d1c" path="res://UI/Themes/Dark.tres" id="1_dkd36"]
[ext_resource type="Script" uid="uid://b5nh5td5bdsfd" path="res://Scripts/MainMenu.gd" id="1_ocgay"]
[ext_resource type="Texture2D" uid="uid://dbh0vh85wks2l" path="res://UI/logo.png" id="2_6d82g"]
[ext_resource type="Texture2D" uid="uid://6mf6wucl3y6k" path="res://UI/MenuBG/BalconyBG.png" id="2_j6v32"]
[ext_resource type="Texture2D" uid="uid://dr6ir8mgbjrs7" path="res://UI/MenuBG/CStageBG.png" id="3_vaoig"]
[ext_resource type="Texture2D" uid="uid://dyyyg85g3jwip" path="res://UI/MenuBG/ProtoRoadBG.png" id="4_dkd36"]
[ext_resource type="Texture2D" uid="uid://cdp1csnrbd46w" path="res://UI/MenuBG/1StageBG.png" id="6_ha2rd"]
[ext_resource type="Script" uid="uid://c8dhm0nhxqlth" path="res://Scripts/OptionsPanel.gd" id="8_wdeli"]
[ext_resource type="Script" uid="uid://c8dhm0nhxqlth" path="res://Scripts/GraphicsOptions.gd" id="8_wdeli"]
[ext_resource type="Script" uid="uid://bmqi57p5yipll" path="res://Scripts/InterfaceOptions.gd" id="9_wyv1s"]
[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_dkd36"]
@ -41,7 +41,6 @@ anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
theme = ExtResource("1_dkd36")
script = ExtResource("1_ocgay")
[node name="PleaseRestart" type="AcceptDialog" parent="."]
@ -735,28 +734,27 @@ vertical_alignment = 1
[node name="TabBar" type="TabBar" parent="SettingsScreen/DialogPanel"]
layout_mode = 1
anchors_preset = -1
anchor_top = 0.173
anchor_right = 1.019
anchor_bottom = 0.252
offset_left = -1.0
offset_top = -3.41601
offset_right = -10.0
offset_bottom = -19.184
anchor_top = 0.2
anchor_right = 1.0
anchor_bottom = 0.25
offset_left = 4.0
offset_right = -4.0
grow_horizontal = 2
grow_vertical = 2
current_tab = 0
tab_count = 1
tab_count = 2
tab_0/title = "Graphics"
tab_1/title = "Interface"
[node name="GraphicsPanel" type="Panel" parent="SettingsScreen/DialogPanel"]
layout_mode = 1
anchors_preset = -1
anchor_top = 0.218
anchor_top = 0.25
anchor_right = 1.0
anchor_bottom = 1.0
offset_top = 0.944
offset_right = 1.0
offset_bottom = -2.0
offset_left = 4.0
offset_right = -4.0
offset_bottom = -4.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("8_wdeli")
@ -891,6 +889,81 @@ text = "120"
horizontal_alignment = 2
vertical_alignment = 1
[node name="InterfacePanel" type="Panel" parent="SettingsScreen/DialogPanel"]
visible = false
layout_mode = 1
anchors_preset = -1
anchor_top = 0.25
anchor_right = 1.0
anchor_bottom = 1.0
offset_left = 4.0
offset_right = -4.0
offset_bottom = -4.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("9_wyv1s")
[node name="ScalingLabel" type="Label" parent="SettingsScreen/DialogPanel/InterfacePanel"]
layout_mode = 1
anchors_preset = -1
anchor_right = 0.5
offset_left = 4.0
offset_top = 4.0
offset_right = -4.0
offset_bottom = 36.0
grow_horizontal = 2
text = "Interface Scaling:"
horizontal_alignment = 2
vertical_alignment = 1
[node name="ThemeLabel" type="Label" parent="SettingsScreen/DialogPanel/InterfacePanel"]
layout_mode = 1
anchors_preset = -1
anchor_right = 0.5
offset_left = 4.0
offset_top = 40.0
offset_right = -4.0
offset_bottom = 72.0
grow_horizontal = 2
grow_vertical = 2
text = "Theme:"
horizontal_alignment = 2
vertical_alignment = 1
[node name="ScalingOption" type="OptionButton" parent="SettingsScreen/DialogPanel/InterfacePanel"]
layout_mode = 1
anchors_preset = -1
anchor_left = 0.5
anchor_right = 1.0
offset_left = 4.0
offset_top = 4.0
offset_right = -4.0
offset_bottom = 36.0
alignment = 1
selected = 0
item_count = 2
popup/item_0/text = "Disabled"
popup/item_0/id = 0
popup/item_1/text = "Enabled"
popup/item_1/id = 1
[node name="ThemeOption" type="OptionButton" parent="SettingsScreen/DialogPanel/InterfacePanel"]
layout_mode = 1
anchors_preset = -1
anchor_left = 0.5
anchor_right = 1.0
offset_left = 4.0
offset_top = 40.0
offset_right = -4.0
offset_bottom = 72.0
alignment = 1
selected = 0
item_count = 2
popup/item_0/text = "Dark"
popup/item_0/id = 0
popup/item_1/text = "Light"
popup/item_1/id = 1
[node name="VersionLabel" type="Label" parent="."]
layout_mode = 1
anchors_preset = -1
@ -924,6 +997,9 @@ vertical_alignment = 1
[connection signal="pressed" from="CreditsScreen/InputEater" to="." method="_on_input_eater_pressed"]
[connection signal="pressed" from="SettingsScreen/InputEater" to="." method="_on_input_eater_pressed"]
[connection signal="tab_changed" from="SettingsScreen/DialogPanel/TabBar" to="SettingsScreen/DialogPanel/GraphicsPanel" method="_on_tab_bar_tab_changed"]
[connection signal="tab_changed" from="SettingsScreen/DialogPanel/TabBar" to="SettingsScreen/DialogPanel/InterfacePanel" method="_on_tab_bar_tab_changed"]
[connection signal="item_selected" from="SettingsScreen/DialogPanel/GraphicsPanel/AAOption" to="SettingsScreen/DialogPanel/GraphicsPanel" method="_on_option_aa_msaa_item_selected"]
[connection signal="item_selected" from="SettingsScreen/DialogPanel/GraphicsPanel/SSAAOption" to="SettingsScreen/DialogPanel/GraphicsPanel" method="_on_option_aa_ss_item_selected"]
[connection signal="value_changed" from="SettingsScreen/DialogPanel/GraphicsPanel/FOVSlider" to="SettingsScreen/DialogPanel/GraphicsPanel" method="_on_fov_slider_value_changed"]
[connection signal="item_selected" from="SettingsScreen/DialogPanel/InterfacePanel/ScalingOption" to="SettingsScreen/DialogPanel/InterfacePanel" method="_on_scaling_option_item_selected"]
[connection signal="item_selected" from="SettingsScreen/DialogPanel/InterfacePanel/ThemeOption" to="SettingsScreen/DialogPanel/InterfacePanel" method="_on_theme_option_item_selected"]