From 2aba84aa0fd93174941cf084e6469b09f0e18d8c Mon Sep 17 00:00:00 2001 From: Ryan Reed Date: Sat, 29 Mar 2025 22:12:54 -0400 Subject: [PATCH] Fix hiding UI when saving game and backing out to MainMenu from submenus --- scenes/ui/pause_menu/pause_menu.gd | 2 +- scenes/ui/pause_menu/pause_menu.tscn | 6 ++++++ scenes/ui/pause_menu/saves_menu.gd | 16 +++++----------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scenes/ui/pause_menu/pause_menu.gd b/scenes/ui/pause_menu/pause_menu.gd index 93597bc..c9b49db 100644 --- a/scenes/ui/pause_menu/pause_menu.gd +++ b/scenes/ui/pause_menu/pause_menu.gd @@ -33,7 +33,7 @@ func _unhandled_input(event: InputEvent) -> void: elif event.is_action_pressed("ui_cancel") and visible and _active_menu == "MainMenu": menu_mapping["MainMenu"].animation_player.play("hide") elif event.is_action_pressed("ui_cancel"): - menu_mapping[_active_menu].animation_player.play("hide") + open_menu.emit("MainMenu") ## The animation to show the next menu will take place in _on_animation_finished() diff --git a/scenes/ui/pause_menu/pause_menu.tscn b/scenes/ui/pause_menu/pause_menu.tscn index b0626a6..18e4ea1 100644 --- a/scenes/ui/pause_menu/pause_menu.tscn +++ b/scenes/ui/pause_menu/pause_menu.tscn @@ -20,9 +20,15 @@ script = ExtResource("1_ugqbi") [node name="MainMenu" parent="." instance=ExtResource("2_ugqbi")] layout_mode = 1 +offset_left = -400.0 +offset_right = 0.0 [node name="SettingsMenu" parent="." instance=ExtResource("3_8mx0f")] layout_mode = 1 +offset_left = -400.0 +offset_right = 0.0 [node name="SavesMenu" parent="." instance=ExtResource("4_rv5mv")] layout_mode = 1 +offset_left = -450.0 +offset_right = 0.0 diff --git a/scenes/ui/pause_menu/saves_menu.gd b/scenes/ui/pause_menu/saves_menu.gd index 8edd9cc..d1bb7f2 100644 --- a/scenes/ui/pause_menu/saves_menu.gd +++ b/scenes/ui/pause_menu/saves_menu.gd @@ -24,23 +24,17 @@ func init() -> void: pause_menu.open_menu.connect(_on_open_menu) -#func open_menu() -> void: -# save_files_list_ui.refresh_saves_list() -# super.open_menu() - - func _on_create_save_button_pressed() -> void: var save_name: String = save_name_input.text if save_name.strip_edges() == "": save_name = Time.get_datetime_string_from_system(false, true) - #if ui_node != null: - # ui_node.visible = false - # await get_tree().create_timer(.150).timeout # A hack to allow time for UI to hide before taking screenshot - SaveGameManager.create_save.emit(save_name) - #if ui_node != null: - # ui_node.visible = true new_save_ui.hide() + + SignalManager.hide_ui.emit() + await get_tree().create_timer(.150).timeout # A hack to allow time for UI to hide before taking screenshot + SaveGameManager.create_save.emit(save_name) + SignalManager.resume_game.emit() func _on_create_save_cancel_button_pressed() -> void: