Browse Source

Fix hiding UI when saving game and backing out to MainMenu from submenus

pull/21/head
Ryan Reed 1 month ago
parent
commit
2aba84aa0f
3 changed files with 12 additions and 12 deletions
  1. +1
    -1
      scenes/ui/pause_menu/pause_menu.gd
  2. +6
    -0
      scenes/ui/pause_menu/pause_menu.tscn
  3. +5
    -11
      scenes/ui/pause_menu/saves_menu.gd

+ 1
- 1
scenes/ui/pause_menu/pause_menu.gd View File

@ -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()


+ 6
- 0
scenes/ui/pause_menu/pause_menu.tscn View File

@ -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

+ 5
- 11
scenes/ui/pause_menu/saves_menu.gd View File

@ -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:


Loading…
Cancel
Save