diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-12 22:33:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 22:33:19 +0100 |
| commit | 4f85cad013c5469a39287e9aa474735f950e302c (patch) | |
| tree | 7c05b1d2de4f586e5a289d49e4a980ca9e4f9087 | |
| parent | 74facb6d392ad9c872bba23dad6fb0c67ded264a (diff) | |
| parent | 7cc33b14c9fd09d01bcafdf5c491a683a52a7fa1 (diff) | |
Merge pull request #54924 from Calinou/editor-macos-rename-shortcut-enter
| -rw-r--r-- | editor/filesystem_dock.cpp | 1 | ||||
| -rw-r--r-- | editor/project_manager.cpp | 1 | ||||
| -rw-r--r-- | editor/scene_tree_dock.cpp | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index f2a3aa3b44..e58113fa0a 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -2799,6 +2799,7 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { ED_SHORTCUT("filesystem_dock/duplicate", TTR("Duplicate..."), KEY_MASK_CMD | KEY_D); ED_SHORTCUT("filesystem_dock/delete", TTR("Delete"), KEY_DELETE); ED_SHORTCUT("filesystem_dock/rename", TTR("Rename..."), KEY_F2); + ED_SHORTCUT_OVERRIDE("filesystem_dock/rename", "macos", KEY_ENTER); VBoxContainer *top_vbc = memnew(VBoxContainer); add_child(top_vbc); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 150dde79e5..e02e62025c 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -2552,6 +2552,7 @@ ProjectManager::ProjectManager() { rename_btn = memnew(Button); rename_btn->set_text(TTR("Rename")); + // The F2 shortcut isn't overridden with Enter on macOS as Enter is already used to edit a project. rename_btn->set_shortcut(ED_SHORTCUT("project_manager/rename_project", TTR("Rename Project"), KEY_F2)); rename_btn->connect("pressed", callable_mp(this, &ProjectManager::_rename_project)); tree_vb->add_child(rename_btn); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index def97345aa..2d88a1f9f6 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -3230,7 +3230,11 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel filter_hbc->add_theme_constant_override("separate", 0); ED_SHORTCUT("scene_tree/rename", TTR("Rename"), KEY_F2); + ED_SHORTCUT_OVERRIDE("scene_tree/rename", "macos", KEY_ENTER); + ED_SHORTCUT("scene_tree/batch_rename", TTR("Batch Rename"), KEY_MASK_SHIFT | KEY_F2); + ED_SHORTCUT_OVERRIDE("scene_tree/batch_rename", "macos", KEY_MASK_SHIFT | KEY_ENTER); + ED_SHORTCUT("scene_tree/add_child_node", TTR("Add Child Node"), KEY_MASK_CMD | KEY_A); ED_SHORTCUT("scene_tree/instance_scene", TTR("Instantiate Child Scene"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_A); ED_SHORTCUT("scene_tree/expand_collapse_all", TTR("Expand/Collapse All")); |