forked from team-sg/hero-mark-2
fix fullscreen buggy :3
This commit is contained in:
parent
7020914046
commit
e85c09a6a4
4 changed files with 15 additions and 17 deletions
|
@ -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)
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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]
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue