diff options
-rw-r--r-- | client/global.gd | 19 | ||||
-rw-r--r-- | client/menu/settings_menu.gd | 1 | ||||
-rw-r--r-- | client/menu/settings_menu.tscn | 2 |
3 files changed, 16 insertions, 6 deletions
diff --git a/client/global.gd b/client/global.gd index 38ddace9..3429db85 100644 --- a/client/global.gd +++ b/client/global.gd @@ -34,6 +34,11 @@ const DEFAULT_PROFILE := { } var default_settings := { + "fullscreen": { + "type": "toggle", + "value": false, + "description": tr("Fullscreen") + }, "interpolate_camera_rotation": { "type": "toggle", "value": true, @@ -115,14 +120,18 @@ var fade_next := false # Set true when transitioning from another scene (fade in func _init(): profile = load_dict("user://profile", DEFAULT_PROFILE) settings = load_dict("user://settings", default_settings) - print("DONE LOADING") + update_fullscreen() func _input(event): if Input.is_action_just_pressed("fullscreen"): - if DisplayServer.window_get_mode() != DisplayServer.WINDOW_MODE_FULLSCREEN: - DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN) - else: - DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED) + settings["fullscreen"]["value"] = !settings["fullscreen"]["value"] + update_fullscreen() + +func update_fullscreen(): + if settings["fullscreen"]["value"]: + DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_FULLSCREEN) + else: + DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED) func save_profile(): save_dict("user://profile", profile) diff --git a/client/menu/settings_menu.gd b/client/menu/settings_menu.gd index 68f3f2fc..e593caa0 100644 --- a/client/menu/settings_menu.gd +++ b/client/menu/settings_menu.gd @@ -24,6 +24,7 @@ func _on_back_pressed(): for k in settings.keys(): Global.settings[k]["value"] = settings[k].get_value() Global.save_settings() + Global.update_fullscreen() menu_manager.go_back() func _ready(): diff --git a/client/menu/settings_menu.tscn b/client/menu/settings_menu.tscn index 9be24d86..ecaea17c 100644 --- a/client/menu/settings_menu.tscn +++ b/client/menu/settings_menu.tscn @@ -59,6 +59,6 @@ size_flags_vertical = 3 [node name="Back" type="Button" parent="OuterGap/Panel/InnerGap/VBoxContainer"] layout_mode = 2 size_flags_vertical = 8 -text = "Back to Main Menu" +text = "Save & Apply" [connection signal="pressed" from="OuterGap/Panel/InnerGap/VBoxContainer/Back" to="." method="_on_back_pressed"] |