Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Centre Canvas Option #1123

Merged
merged 5 commits into from
Oct 16, 2024
Merged

Added Centre Canvas Option #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b81e522
add a centre frame option
Variable-ind Oct 16, 2024
155af91
moved code to view menu
Variable-ind Oct 16, 2024
c7a9f46
restore left over stuff
Variable-ind Oct 16, 2024
b4b5a82
fix typo
Variable-ind Oct 16, 2024
0e990cf
Merge branch 'Orama-Interactive:master' into centre-speite
Variable-ind Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions project.godot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,11 @@ previous_project={
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":true,"ctrl_pressed":true,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194306,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
]
}
centre_canvas={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":true,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":67,"physical_keycode":0,"key_label":0,"unicode":67,"location":0,"echo":false,"script":null)
]
}

[input_devices]

Expand Down
2 changes: 2 additions & 0 deletions src/Autoload/Global.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ enum FileMenu { NEW, OPEN, OPEN_LAST_PROJECT, RECENT, SAVE, SAVE_AS, EXPORT, EXP
enum EditMenu { UNDO, REDO, COPY, CUT, PASTE, PASTE_IN_PLACE, DELETE, NEW_BRUSH, PREFERENCES }
## Enumeration of items present in the View Menu.
enum ViewMenu {
CENTRE_CANVAS,
TILE_MODE,
TILE_MODE_OFFSETS,
GREYSCALE_VIEW,
Expand Down Expand Up @@ -746,6 +747,7 @@ func _initialize_keychain() -> void:
&"palettize": Keychain.InputAction.new("", "Effects menu", true),
&"pixelize": Keychain.InputAction.new("", "Effects menu", true),
&"posterize": Keychain.InputAction.new("", "Effects menu", true),
&"centre_canvas": Keychain.InputAction.new("", "View menu", true),
&"mirror_view": Keychain.InputAction.new("", "View menu", true),
&"show_grid": Keychain.InputAction.new("", "View menu", true),
&"show_pixel_grid": Keychain.InputAction.new("", "View menu", true),
Expand Down
5 changes: 5 additions & 0 deletions src/UI/TopMenuContainer/TopMenuContainer.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ func _setup_edit_menu() -> void:
func _setup_view_menu() -> void:
# Order as in Global.ViewMenu enum
var view_menu_items := {
"Centre Canvas": "centre_canvas",
"Tile Mode": "",
"Tile Mode Offsets": "",
"Grayscale View": "",
Expand All @@ -226,6 +227,8 @@ func _setup_view_menu() -> void:
_setup_snap_to_submenu(item)
elif item == "Tile Mode Offsets":
view_menu.add_item(item, i)
elif item == "Centre Canvas":
_set_menu_shortcut(view_menu_items[item], view_menu, i, item)
else:
_set_menu_shortcut(view_menu_items[item], view_menu, i, item, true)
view_menu.set_item_checked(Global.ViewMenu.SHOW_RULERS, true)
Expand Down Expand Up @@ -599,6 +602,8 @@ func edit_menu_id_pressed(id: int) -> void:

func view_menu_id_pressed(id: int) -> void:
match id:
Global.ViewMenu.CENTRE_CANVAS:
Global.camera.offset = Global.current_project.size / 2
Global.ViewMenu.TILE_MODE_OFFSETS:
_popup_dialog(get_tree().current_scene.tile_mode_offsets_dialog)
Global.ViewMenu.GREYSCALE_VIEW:
Expand Down