oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fullscreen in optionsgit pull

Browse Source
This commit is contained in:
Eneko Nieto
2023-03-09 00:28:33 +01:00
parent d8d25e5dbb
commit cdaba3a055
4 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addons/escoria-core/game/core-scripts/save_data/esc_savesettings.gd
View File

@@ -39,7 +39,8 @@ export var speech_volume: float = ProjectSettings.get_setting(
"escoria/sound/speech_volume")
# True if game has to be fullscreen
export var fullscreen: bool = false
export var fullscreen: bool = ProjectSettings.get_setting(
"display/window/size/fullscreen")
# Dictionary containing all user-defined settings.
export var custom_settings: Dictionary

3
addons/escoria-core/game/core-scripts/save_data/esc_settings_manager.gd
View File

@@ -61,6 +61,9 @@ func apply_settings() -> void:
)
)
)
OS.window_fullscreen = ESCProjectSettingsManager.get_setting(
ESCProjectSettingsManager.FULLSCREEN
)
TranslationServer.set_locale(
ESCProjectSettingsManager.get_setting(
ESCProjectSettingsManager.TEXT_LANG

17
addons/escoria-core/ui_library/menus/options/options.gd
View File

@@ -61,6 +61,7 @@ func initialize_options(p_settings):
_options.get_node("sound_volume").value = p_settings["sfx_volume"]
_options.get_node("music_volume").value = p_settings["music_volume"]
_options.get_node("speech_volume").value = p_settings["speech_volume"]
_options.get_node("fullscreen").set_pressed_no_signal(p_settings["fullscreen"])
# The language was changed
@@ -142,6 +143,22 @@ func _on_speech_volume_value_changed(value: float) -> void:
settings_changed = true
# Fullscreen was changed
#
# #### Parameters
# - button_pressed: Fullscreen (true) or windowed (false)
func _on_fullscreen_toggled(button_pressed: bool) -> void:
if ESCProjectSettingsManager.get_setting(
ESCProjectSettingsManager.FULLSCREEN
) != button_pressed:
ESCProjectSettingsManager.set_setting(
ESCProjectSettingsManager.FULLSCREEN,
button_pressed
)
escoria.settings_manager.apply_settings()
settings_changed = true
# Save the settings
func _on_apply_pressed():
escoria.settings_manager.custom_settings[CUSTOM_SETTING] = 100

15
addons/escoria-core/ui_library/menus/options/options.tscn
View File

@@ -131,10 +131,22 @@ size_flags_horizontal = 3
max_value = 1.0
step = 0.001
[node name="label6" type="Label" parent="VBoxContainer/MarginContainer/options"]
margin_top = 160.0
margin_right = 137.0
margin_bottom = 154.0
text = "FULLSCREEN"
[node name="fullscreen" type="CheckBox" parent="VBoxContainer/MarginContainer/options"]
margin_left = 177.0
margin_top = 160.0
margin_right = 457.0
margin_bottom = 155.0
[node name="HBoxContainer" type="HBoxContainer" parent="VBoxContainer"]
margin_top = 464.0
margin_right = 1280.0
margin_bottom = 484.0
margin_bottom = 404.0
custom_constants/separation = 20
alignment = 1
@@ -160,5 +172,6 @@ __meta__ = {
[connection signal="value_changed" from="VBoxContainer/MarginContainer/options/sound_volume" to="." method="_on_sound_volume_changed"]
[connection signal="value_changed" from="VBoxContainer/MarginContainer/options/music_volume" to="." method="_on_music_volume_changed"]
[connection signal="value_changed" from="VBoxContainer/MarginContainer/options/speech_volume" to="." method="_on_speech_volume_value_changed"]
[connection signal="toggled" from="VBoxContainer/MarginContainer/options/fullscreen" to="." method="_on_fullscreen_toggled"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/back" to="." method="_on_back_pressed"]
[connection signal="pressed" from="VBoxContainer/HBoxContainer/apply" to="." method="_on_apply_pressed"]