UI improvements
This commit is contained in:
+7
-18
@@ -1,32 +1,25 @@
|
||||
class_name PauseMenu extends Control
|
||||
|
||||
signal opened
|
||||
signal closed
|
||||
class_name PauseMenu extends ClosableMenu
|
||||
|
||||
@export var MAIN:PauseMain
|
||||
@export var settingsPanel:PauseSettings
|
||||
|
||||
func _ready() -> void:
|
||||
close()
|
||||
super._ready()
|
||||
MAIN.resumeRequested.connect(close)
|
||||
MAIN.settingsRequested.connect(_openSettings)
|
||||
UI.MAIN_MENU_DIALOG.confirmed.connect(_goToMainMenu)
|
||||
|
||||
func isOpen() -> bool:
|
||||
return visible
|
||||
|
||||
func open() -> void:
|
||||
visible = true
|
||||
super.open()
|
||||
get_tree().paused = true
|
||||
settingsPanel.close()
|
||||
MAIN.open()
|
||||
opened.emit()
|
||||
|
||||
func close() -> void:
|
||||
get_tree().paused = false
|
||||
visible = false
|
||||
MAIN.close()
|
||||
settingsPanel.close()
|
||||
closed.emit()
|
||||
MAIN.close()
|
||||
super.close()
|
||||
|
||||
func _openSettings() -> void:
|
||||
MAIN.close()
|
||||
@@ -37,11 +30,7 @@ func _goToMainMenu() -> void:
|
||||
SCENE.setScene(SceneSingleton.SceneType.INITIAL)
|
||||
|
||||
func _unhandled_input(event:InputEvent) -> void:
|
||||
if !visible:
|
||||
return
|
||||
if !event.is_action_pressed("ui_cancel"):
|
||||
return
|
||||
if (UI.QUIT_DIALOG != null and UI.QUIT_DIALOG.isOpen) or (UI.MAIN_MENU_DIALOG != null and UI.MAIN_MENU_DIALOG.isOpen):
|
||||
if not event.is_action_pressed("ui_cancel"):
|
||||
return
|
||||
if settingsPanel.isOpen():
|
||||
settingsPanel.close()
|
||||
|
||||
@@ -2,7 +2,7 @@ class_name PauseSettings extends Control
|
||||
|
||||
func open() -> void:
|
||||
visible = true
|
||||
|
||||
|
||||
func close() -> void:
|
||||
visible = false
|
||||
|
||||
|
||||
Reference in New Issue
Block a user