fix fullscreen buggy :3

This commit is contained in:
Haze Weathers 2023-03-08 18:21:15 -05:00
parent 7020914046
commit e85c09a6a4
4 changed files with 15 additions and 17 deletions

View file

@ -3,7 +3,6 @@ extends Node
var resolution = Vector2(256,192) var resolution = Vector2(256,192)
onready var viewport = get_parent().get_node("Main/Control/ViewportContainer/Viewport") onready var viewport = get_parent().get_node("Main/Control/ViewportContainer/Viewport")
var current_sector = Vector2(0,0) var current_sector = Vector2(0,0)
var fullscreen = false
#Onreadys #Onreadys
onready var fade = viewport.get_node("FadeLayer") onready var fade = viewport.get_node("FadeLayer")
onready var viewport_container = get_parent().get_node("Main/Control/ViewportContainer") onready var viewport_container = get_parent().get_node("Main/Control/ViewportContainer")
@ -136,10 +135,3 @@ func _physics_process(delta):
#CRT FILTER #CRT FILTER
if Input.is_action_just_pressed("crt"): if Input.is_action_just_pressed("crt"):
viewport_container.material.set_shader_param("enabled",!viewport_container.material.get_shader_param("enabled")) 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)

View file

@ -27,6 +27,10 @@ func _ready():
defaults = duplicate() defaults = duplicate()
load_options() load_options()
func _unhandled_input(event):
if event.is_action_pressed("fullscreen"):
_set_fullscreen(!fullscreen)
func load_options(): func load_options():
var file = ConfigFile.new() var file = ConfigFile.new()
file.load("user://options.pr") file.load("user://options.pr")

View file

@ -69,17 +69,19 @@ func _gui_input(event):
current_tab.get_node(current_tab.focus_neighbour_bottom).grab_focus() current_tab.get_node(current_tab.focus_neighbour_bottom).grab_focus()
accept_event() accept_event()
func _physics_process(delta): func _unhandled_input(event):
if Input.is_action_just_pressed("ui_accept"): if !has_focus():
return
if event.is_action_pressed("ui_accept"):
apply_options() apply_options()
dirty = false dirty = false
elif Input.is_action_just_pressed("ui_cancel"): elif event.is_action_pressed("ui_cancel"):
if dirty: if dirty:
confirm_dialog.visible = true confirm_dialog.visible = true
confirm_dialog.grab_focus() confirm_dialog.grab_focus()
else: else:
emit_signal("exit") emit_signal("exit")
elif Input.is_action_just_pressed("ui_reset"): elif event.is_action_pressed("ui_reset"):
load_options(Options.defaults) load_options(Options.defaults)
dirty = true dirty = true

View file

@ -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) , 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={ ui_focus_next={
"deadzone": 0.5, "deadzone": 0.5,
"events": [ ] "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) "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] [layer_names]