ruslan/ScrapFrontier
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated option menu

Browse Source
This commit is contained in:
Ruslan Ignatov
2025-12-23 22:14:57 +03:00
parent 451e4f1f67
commit e08a105dbc
5 changed files with 193 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/managers/settings_manager.gd
+2 -9
View File
@@ -20,7 +20,7 @@ var fullscreen : bool:
_apply_video_settings()
_save_settings()
var _window_factor := 0
var _window_factor := 1
var window_factor : int:
get:
return _window_factor
@@ -70,14 +70,7 @@ func _apply_video_settings() -> void:
func _apply_window_scale() -> void:
if _fullscreen: return
var factors := [1, 2, 3, 4, 5, 6]
var factor_index := _window_factor
if factor_index >= factors.size():
factor_index = 0
var scale : int = factors[factor_index]
var new_size := BASE_SIZE * scale
var new_size := BASE_SIZE * _window_factor
var current_position := DisplayServer.window_get_position()
var current_size := DisplayServer.window_get_size()
game/menu/common/options.gd
+39 -12
View File
@@ -1,22 +1,37 @@
extends Control
const WINDOW_FACTOR = "window_factor"
signal show_credits
signal back
@onready var fullscreen_button := $%FullscreenCheckButton
@onready var window_factor_button := $%WindowFactorOptionButton
@onready var credits_button := $%CreditsButton
@onready var back_button := $%BackButton
@onready var fullscreen_button : CheckButton = $%FullscreenCheckButton
@onready var window_factor_buttons : HBoxContainer = $%WindowFactorContainer
@onready var credits_button : Button = $%CreditsButton
@onready var back_button : Button = $%BackButton
@onready var master_slider : Slider = $%MasterSlider
@onready var menu_slider : Slider = $%MenuSlider
@onready var sfx_slider : Slider = $%SFXSlider
@onready var music_slider : Slider = $%MusicSlider
func _ready() -> void:
_connect_window_factor_buttons()
_load_current_settings()
_init_focus()
_setup_neighbors()
func _connect_window_factor_buttons() -> void:
for child in window_factor_buttons.get_children():
if child is Button:
var button : Button = child
button.pressed.connect(_on_window_factor_button_pressed.bind(button))
func _on_visibility_changed() -> void:
if not is_node_ready(): return
if not visible: return
@@ -31,18 +46,29 @@ func _init_focus() -> void:
func _setup_neighbors() -> void:
credits_button.focus_neighbor_left = back_button.get_path()
music_slider.focus_neighbor_bottom = back_button.get_path()
back_button.focus_neighbor_right = credits_button.get_path()
credits_button.focus_neighbor_left = back_button.get_path()
func _load_current_settings() -> void:
print(SettingsManager.window_factor)
fullscreen_button.button_pressed = SettingsManager.fullscreen
window_factor_button.selected = SettingsManager.window_factor
for child in window_factor_buttons.get_children():
if child is Button:
var button : Button = child
var window_factor : int = button.get_meta(WINDOW_FACTOR, 0)
print(window_factor)
if window_factor == SettingsManager.window_factor:
button.button_pressed = true
print(button)
_update_window_factor_disabled()
func _update_window_factor_disabled() -> void:
window_factor_button.disabled = SettingsManager.fullscreen
for child in window_factor_buttons.get_children():
if child is Button:
child.disabled = SettingsManager.fullscreen
func _on_fullscreen_check_button_toggled(toggled: bool) -> void:
@@ -50,14 +76,15 @@ func _on_fullscreen_check_button_toggled(toggled: bool) -> void:
_update_window_factor_disabled()
func _on_window_factor_option_button_item_selected(index: int) -> void:
if not SettingsManager.fullscreen:
SettingsManager.window_factor = index
func _on_credits_button_pressed() -> void:
show_credits.emit()
func _on_back_button_pressed() -> void:
back.emit()
func _on_window_factor_button_pressed(button: Button) -> void:
var window_factor : int = button.get_meta(WINDOW_FACTOR, 0)
if window_factor > 0:
SettingsManager.window_factor = window_factor
game/menu/common/options.tscn
+138 -37
View File
@@ -1,8 +1,10 @@
[gd_scene load_steps=5 format=3 uid="uid://btr60idiit4y7"]
[gd_scene load_steps=6 format=3 uid="uid://btr60idiit4y7"]
[ext_resource type="Script" uid="uid://ceng1u112aqg0" path="res://game/menu/common/options.gd" id="1_61pji"]
[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_1tdpy"]
[sub_resource type="ButtonGroup" id="ButtonGroup_6ueaa"]
[sub_resource type="InputEventAction" id="InputEventAction_61pji"]
action = &"ui_cancel"
@@ -11,65 +13,161 @@ events = [SubResource("InputEventAction_61pji")]
[node name="Options" type="Control"]
layout_mode = 3
anchors_preset = 0
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
script = ExtResource("1_61pji")
[node name="VBoxContainer" type="VBoxContainer" parent="."]
top_level = true
layout_mode = 0
offset_left = 100.0
offset_top = 100.0
offset_right = 271.0
offset_bottom = 194.0
alignment = 1
[node name="MarginContainer" type="MarginContainer" parent="."]
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
theme_override_constants/margin_bottom = 10
[node name="OptionsGridContainer" type="GridContainer" parent="VBoxContainer"]
[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer"]
layout_mode = 2
follow_focus = true
[node name="MarginContainer" type="MarginContainer" parent="MarginContainer/ScrollContainer"]
layout_mode = 2
size_flags_horizontal = 3
theme_override_constants/margin_top = 10
[node name="OptionsGridContainer" type="GridContainer" parent="MarginContainer/ScrollContainer/MarginContainer"]
layout_mode = 2
size_flags_horizontal = 6
columns = 2
[node name="FullscreenLabel" type="Label" parent="VBoxContainer/OptionsGridContainer"]
[node name="FullscreenLabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
text = "Fullscreen"
[node name="FullscreenCheckButton" type="CheckButton" parent="VBoxContainer/OptionsGridContainer"]
[node name="FullscreenCheckButton" type="CheckButton" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
mouse_filter = 2
[node name="WindowFactorLabel" type="Label" parent="VBoxContainer/OptionsGridContainer"]
[node name="WindowFactorLabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
text = "Window Factor"
[node name="WindowFactorOptionButton" type="OptionButton" parent="VBoxContainer/OptionsGridContainer"]
[node name="WindowFactorContainer" type="HBoxContainer" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
[node name="ButtonX1" type="Button" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/WindowFactorContainer"]
layout_mode = 2
mouse_filter = 2
selected = 0
item_count = 6
popup/item_0/text = "×1"
popup/item_0/id = 0
popup/item_1/text = "×2"
popup/item_1/id = 1
popup/item_2/text = "×3"
popup/item_2/id = 2
popup/item_3/text = "×4"
popup/item_3/id = 3
popup/item_4/text = "×5"
popup/item_4/id = 4
popup/item_5/text = "×6"
popup/item_5/id = 5
toggle_mode = true
button_group = SubResource("ButtonGroup_6ueaa")
text = "×1"
metadata/window_factor = 1
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
[node name="ButtonX2" type="Button" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/WindowFactorContainer"]
layout_mode = 2
mouse_filter = 2
toggle_mode = true
button_group = SubResource("ButtonGroup_6ueaa")
text = "×2"
metadata/window_factor = 2
[node name="ButtonX3" type="Button" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/WindowFactorContainer"]
layout_mode = 2
mouse_filter = 2
toggle_mode = true
button_group = SubResource("ButtonGroup_6ueaa")
text = "×3"
metadata/window_factor = 3
[node name="ButtonX4" type="Button" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/WindowFactorContainer"]
layout_mode = 2
mouse_filter = 2
toggle_mode = true
button_group = SubResource("ButtonGroup_6ueaa")
text = "×4"
metadata/window_factor = 4
[node name="ButtonX5" type="Button" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/WindowFactorContainer"]
layout_mode = 2
mouse_filter = 2
toggle_mode = true
button_group = SubResource("ButtonGroup_6ueaa")
text = "×5"
metadata/window_factor = 5
[node name="MasterLabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
layout_mode = 2
text = "Menu Volume"
[node name="MasterSlider" type="HSlider" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(100, 0)
layout_mode = 2
mouse_filter = 2
step = 10.0
value = 100.0
rounded = true
scrollable = false
[node name="MenuLabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
layout_mode = 2
text = "Menu Volume"
[node name="MenuSlider" type="HSlider" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(100, 0)
layout_mode = 2
mouse_filter = 2
step = 10.0
value = 100.0
rounded = true
scrollable = false
[node name="SFXLabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
layout_mode = 2
text = "SFX Volume"
[node name="SFXSlider" type="HSlider" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(100, 0)
layout_mode = 2
mouse_filter = 2
step = 10.0
value = 100.0
rounded = true
scrollable = false
[node name="MusicLabel" type="Label" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
layout_mode = 2
text = "Music Volume"
[node name="MusicSlider" type="HSlider" parent="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer"]
unique_name_in_owner = true
custom_minimum_size = Vector2(100, 0)
layout_mode = 2
mouse_filter = 2
step = 10.0
value = 100.0
rounded = true
scrollable = false
[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer"]
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 8
alignment = 2
[node name="CreditsButton" type="Button" parent="VBoxContainer/HBoxContainer"]
[node name="CreditsButton" type="Button" parent="MarginContainer/HBoxContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
@@ -77,7 +175,7 @@ mouse_filter = 2
theme = ExtResource("2_1tdpy")
text = "Credits"
[node name="BackButton" type="Button" parent="VBoxContainer/HBoxContainer"]
[node name="BackButton" type="Button" parent="MarginContainer/HBoxContainer"]
unique_name_in_owner = true
z_index = 100
layout_mode = 2
@@ -86,8 +184,11 @@ theme = ExtResource("2_1tdpy")
shortcut = SubResource("Shortcut_1tdpy")
text = "Back"
[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"]
layout_mode = 2
alignment = 1
[connection signal="visibility_changed" from="." to="." method="_on_visibility_changed"]
[connection signal="toggled" from="VBoxContainer/OptionsGridContainer/FullscreenCheckButton" to="." method="_on_fullscreen_check_button_toggled"]
[connection signal="item_selected" from="VBoxContainer/OptionsGridContainer/WindowFactorOptionButton" to="." method="_on_window_factor_option_button_item_selected"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/CreditsButton" to="." method="_on_credits_button_pressed"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/BackButton" to="." method="_on_back_button_pressed"]
[connection signal="toggled" from="MarginContainer/ScrollContainer/MarginContainer/OptionsGridContainer/FullscreenCheckButton" to="." method="_on_fullscreen_check_button_toggled"]
[connection signal="pressed" from="MarginContainer/HBoxContainer/CreditsButton" to="." method="_on_credits_button_pressed"]
[connection signal="pressed" from="MarginContainer/HBoxContainer/BackButton" to="." method="_on_back_button_pressed"]
game/menu/ingame/pause_screen.tscn
+6
View File
@@ -14,7 +14,13 @@ script = ExtResource("1_fe1q8")
layout_mode = 0
[node name="Options" parent="." instance=ExtResource("3_3gwb3")]
custom_minimum_size = Vector2(640, 360)
layout_mode = 0
anchors_preset = 0
anchor_right = 0.0
anchor_bottom = 0.0
grow_horizontal = 1
grow_vertical = 1
[node name="Credits" parent="." instance=ExtResource("4_jph5s")]
layout_mode = 0
game/menu/main/title_screen.tscn
+8 -1
View File
@@ -16,7 +16,14 @@ script = ExtResource("1_lxdol")
layout_mode = 0
[node name="Options" parent="." instance=ExtResource("3_88gnj")]
layout_mode = 0
layout_mode = 1
anchors_preset = 8
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
offset_right = 640.0
offset_bottom = 360.0
[node name="Credits" parent="." instance=ExtResource("4_w1y3c")]
layout_mode = 0