huskee/Pixelorama
1
0
Fork 0
mirror of https://github.com/Orama-Interactive/Pixelorama.git synced 2025-01-18 17:19:50 +00:00
Code Issues Wiki Activity

Remove Global.can_draw conditions from TopMenuContainer

Browse source 
These were needed with Godot 3 to ensure that you couldn't open any other dialog when a dialog is already open, by using keyboard shortcuts. This no longer seems to be required in Godot 4.
This commit is contained in:
Emmanouil Papadeas 2024-01-24 02:37:28 +02:00
parent 3a852e44ff
commit d9c0cd7546
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/UI/TopMenuContainer/TopMenuContainer.gd
View file

@ -398,8 +398,6 @@ func _popup_dialog(dialog: Window, dialog_size := Vector2i.ZERO) -> void:
func file_menu_id_pressed(id: int) -> void: func file_menu_id_pressed(id: int) -> void:
if not Global.can_draw:
return
match id: match id:
Global.FileMenu.NEW: Global.FileMenu.NEW:
_on_new_project_file_menu_option_pressed() _on_new_project_file_menu_option_pressed()
@ -464,8 +462,6 @@ func _on_recent_projects_submenu_id_pressed(id: int) -> void:
func edit_menu_id_pressed(id: int) -> void: func edit_menu_id_pressed(id: int) -> void:
if not Global.can_draw:
return
match id: match id:
Global.EditMenu.UNDO: Global.EditMenu.UNDO:
Global.current_project.commit_undo() Global.current_project.commit_undo()
@ -490,8 +486,6 @@ func edit_menu_id_pressed(id: int) -> void:
func view_menu_id_pressed(id: int) -> void: func view_menu_id_pressed(id: int) -> void:
if not Global.can_draw:
return
match id: match id:
Global.ViewMenu.TILE_MODE_OFFSETS: Global.ViewMenu.TILE_MODE_OFFSETS:
_popup_dialog(Global.control.get_node("Dialogs/TileModeOffsetsDialog")) _popup_dialog(Global.control.get_node("Dialogs/TileModeOffsetsDialog"))
@ -518,8 +512,6 @@ func view_menu_id_pressed(id: int) -> void:
func window_menu_id_pressed(id: int) -> void: func window_menu_id_pressed(id: int) -> void:
if not Global.can_draw:
return
match id: match id:
Global.WindowMenu.WINDOW_OPACITY: Global.WindowMenu.WINDOW_OPACITY:
_popup_dialog(window_opacity_dialog) _popup_dialog(window_opacity_dialog)
@ -703,8 +695,6 @@ func _toggle_fullscreen() -> void:
func image_menu_id_pressed(id: int) -> void: func image_menu_id_pressed(id: int) -> void:
if not Global.can_draw:
return
match id: match id:
Global.ImageMenu.SCALE_IMAGE: Global.ImageMenu.SCALE_IMAGE:
_popup_dialog(Global.control.get_node("Dialogs/ImageEffects/ScaleImage")) _popup_dialog(Global.control.get_node("Dialogs/ImageEffects/ScaleImage"))
@ -744,8 +734,6 @@ func image_menu_id_pressed(id: int) -> void:
func select_menu_id_pressed(id: int) -> void: func select_menu_id_pressed(id: int) -> void:
if not Global.can_draw:
return
match id: match id:
Global.SelectMenu.SELECT_ALL: Global.SelectMenu.SELECT_ALL:
Global.canvas.selection.select_all() Global.canvas.selection.select_all()
@ -762,8 +750,6 @@ func select_menu_id_pressed(id: int) -> void:
func help_menu_id_pressed(id: int) -> void: func help_menu_id_pressed(id: int) -> void:
if not Global.can_draw:
return
match id: match id:
Global.HelpMenu.VIEW_SPLASH_SCREEN: Global.HelpMenu.VIEW_SPLASH_SCREEN:
_popup_dialog(Global.control.get_node("Dialogs/SplashDialog")) _popup_dialog(Global.control.get_node("Dialogs/SplashDialog"))