From e85c09a6a4f25c2eef7a28c91c56d3624553ebe2 Mon Sep 17 00:00:00 2001
From: Haze Weathers <hazel.lsnider@gmail.com>
Date: Wed, 8 Mar 2023 18:21:15 -0500
Subject: [PATCH] fix fullscreen buggy :3

---
 autoloads/game.gd             |  8 --------
 autoloads/options.gd          |  4 ++++
 objects/hud/options_screen.gd | 10 ++++++----
 project.godot                 | 10 +++++-----
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/autoloads/game.gd b/autoloads/game.gd
index 16b6639..1c70e9b 100644
--- a/autoloads/game.gd
+++ b/autoloads/game.gd
@@ -3,7 +3,6 @@ extends Node
 var resolution = Vector2(256,192)
 onready var viewport = get_parent().get_node("Main/Control/ViewportContainer/Viewport")
 var current_sector = Vector2(0,0)
-var fullscreen = false
 #Onreadys
 onready var fade = viewport.get_node("FadeLayer")
 onready var viewport_container = get_parent().get_node("Main/Control/ViewportContainer")
@@ -136,10 +135,3 @@ func _physics_process(delta):
 		#CRT FILTER
 		if Input.is_action_just_pressed("crt"):
 			viewport_container.material.set_shader_param("enabled",!viewport_container.material.get_shader_param("enabled"))
-		#Fullscreen
-		if Input.is_action_just_pressed("fullscreen"):
-			fullscreen = !fullscreen
-			if fullscreen:
-				OS.set_window_fullscreen(true)
-			else:
-				OS.set_window_fullscreen(false)
diff --git a/autoloads/options.gd b/autoloads/options.gd
index 8f86717..d8958f3 100644
--- a/autoloads/options.gd
+++ b/autoloads/options.gd
@@ -27,6 +27,10 @@ func _ready():
 		defaults = duplicate()
 	load_options()
 
+func _unhandled_input(event):
+	if event.is_action_pressed("fullscreen"):
+		_set_fullscreen(!fullscreen)
+
 func load_options():
 	var file = ConfigFile.new()
 	file.load("user://options.pr")
diff --git a/objects/hud/options_screen.gd b/objects/hud/options_screen.gd
index a00054e..30e80a3 100644
--- a/objects/hud/options_screen.gd
+++ b/objects/hud/options_screen.gd
@@ -69,17 +69,19 @@ func _gui_input(event):
 		current_tab.get_node(current_tab.focus_neighbour_bottom).grab_focus()
 	accept_event()
 
-func _physics_process(delta):
-	if Input.is_action_just_pressed("ui_accept"):
+func _unhandled_input(event):
+	if !has_focus():
+		return
+	if event.is_action_pressed("ui_accept"):
 		apply_options()
 		dirty = false
-	elif Input.is_action_just_pressed("ui_cancel"):
+	elif event.is_action_pressed("ui_cancel"):
 		if dirty:
 			confirm_dialog.visible = true
 			confirm_dialog.grab_focus()
 		else:
 			emit_signal("exit")
-	elif Input.is_action_just_pressed("ui_reset"):
+	elif event.is_action_pressed("ui_reset"):
 		load_options(Options.defaults)
 		dirty = true
 
diff --git a/project.godot b/project.godot
index 4b810b6..fd73005 100644
--- a/project.godot
+++ b/project.godot
@@ -107,11 +107,6 @@ ui_cancel={
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":2,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
-ui_reset={
-"deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":67,"unicode":0,"echo":false,"script":null)
- ]
-}
 ui_focus_next={
 "deadzone": 0.5,
 "events": [  ]
@@ -222,6 +217,11 @@ sword={
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":67,"unicode":0,"echo":false,"script":null)
  ]
 }
+ui_reset={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":67,"unicode":0,"echo":false,"script":null)
+ ]
+}
 
 [layer_names]