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

Change Layout menu and rename Edit Mode to Moveable Panels

Browse source
This commit is contained in:
Manolis Papadeas 2022-03-16 00:30:24 +02:00
parent ea78114fb2
commit bffc36a018
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/UI/TopMenuContainer.gd
View file

@ -11,7 +11,7 @@ enum ViewMenuId {
SHOW_RULERS, SHOW_RULERS,
SHOW_GUIDES, SHOW_GUIDES,
} }
enum WindowMenuId { WINDOW_OPACITY, PANELS, LAYOUTS, EDIT_MODE, ZEN_MODE, FULLSCREEN_MODE } enum WindowMenuId { WINDOW_OPACITY, PANELS, LAYOUTS, ZEN_MODE, FULLSCREEN_MODE }
enum ImageMenuId { enum ImageMenuId {
SCALE_IMAGE, SCALE_IMAGE,
CENTRALIZE_IMAGE, CENTRALIZE_IMAGE,
@ -188,7 +188,6 @@ func _setup_window_menu() -> void:
"Window Opacity": 0, "Window Opacity": 0,
"Panels": 0, "Panels": 0,
"Layouts": 0, "Layouts": 0,
"Edit Mode": InputMap.get_action_list("edit_mode")[0].get_scancode_with_modifiers(),
"Zen Mode": InputMap.get_action_list("zen_mode")[0].get_scancode_with_modifiers(), "Zen Mode": InputMap.get_action_list("zen_mode")[0].get_scancode_with_modifiers(),
"Fullscreen Mode": "Fullscreen Mode":
InputMap.get_action_list("toggle_fullscreen")[0].get_scancode_with_modifiers(), InputMap.get_action_list("toggle_fullscreen")[0].get_scancode_with_modifiers(),
@ -243,7 +242,6 @@ func _setup_layouts_submenu(item: String) -> void:
layouts_submenu.set_name("layouts_submenu") layouts_submenu.set_name("layouts_submenu")
layouts_submenu.hide_on_checkable_item_selection = false layouts_submenu.hide_on_checkable_item_selection = false
populate_layouts_submenu() populate_layouts_submenu()
layouts_submenu.set_item_checked(0, true)
layouts_submenu.connect("id_pressed", self, "_layouts_submenu_id_pressed") layouts_submenu.connect("id_pressed", self, "_layouts_submenu_id_pressed")
window_menu.add_child(layouts_submenu) window_menu.add_child(layouts_submenu)
@ -255,11 +253,13 @@ func _setup_layouts_submenu(item: String) -> void:
func populate_layouts_submenu() -> void: func populate_layouts_submenu() -> void:
layouts_submenu.clear() # Does not do anything if it's called for the first time layouts_submenu.clear() # Does not do anything if it's called for the first time
layouts_submenu.add_check_item(
"Moveable Panels", 0, InputMap.get_action_list("edit_mode")[0].get_scancode_with_modifiers()
)
layouts_submenu.add_item("Manage Layouts", 1)
for layout in layouts: for layout in layouts:
layouts_submenu.add_radio_check_item(layout[0]) layouts_submenu.add_radio_check_item(layout[0])
layouts_submenu.add_item("Manage Layouts")
func _setup_image_menu() -> void: func _setup_image_menu() -> void:
var image_menu_items := { # order as in ImageMenuId enum var image_menu_items := { # order as in ImageMenuId enum
@ -478,9 +478,6 @@ func window_menu_id_pressed(id: int) -> void:
WindowMenuId.WINDOW_OPACITY: WindowMenuId.WINDOW_OPACITY:
window_opacity_dialog.popup_centered() window_opacity_dialog.popup_centered()
Global.dialog_open(true) Global.dialog_open(true)
WindowMenuId.EDIT_MODE:
ui.tabs_visible = !ui.tabs_visible
window_menu.set_item_checked(WindowMenuId.EDIT_MODE, ui.tabs_visible)
WindowMenuId.ZEN_MODE: WindowMenuId.ZEN_MODE:
_toggle_zen_mode() _toggle_zen_mode()
WindowMenuId.FULLSCREEN_MODE: WindowMenuId.FULLSCREEN_MODE:
@ -498,11 +495,14 @@ func _panels_submenu_id_pressed(id: int) -> void:
func _layouts_submenu_id_pressed(id: int) -> void: func _layouts_submenu_id_pressed(id: int) -> void:
if id < layouts.size(): if id == 0:
set_layout(id) ui.tabs_visible = !ui.tabs_visible
else: layouts_submenu.set_item_checked(0, ui.tabs_visible)
elif id == 1:
Global.control.get_node("Dialogs/ManageLayouts").popup_centered() Global.control.get_node("Dialogs/ManageLayouts").popup_centered()
Global.dialog_open(true) Global.dialog_open(true)
else:
set_layout(id - 2)
func set_layout(id: int) -> void: func set_layout(id: int) -> void:
@ -511,7 +511,8 @@ func set_layout(id: int) -> void:
selected_layout = id selected_layout = id
ui.layout = layouts[id][1].clone() # Clone is needed to avoid modifying premade layouts ui.layout = layouts[id][1].clone() # Clone is needed to avoid modifying premade layouts
for i in layouts.size(): for i in layouts.size():
layouts_submenu.set_item_checked(i, i == id) var offset: int = i + 2
layouts_submenu.set_item_checked(offset, offset == (id + 2))
for i in ui_elements.size(): for i in ui_elements.size():
var is_hidden: bool = ui.is_control_hidden(ui_elements[i]) var is_hidden: bool = ui.is_control_hidden(ui_elements[i])