From 464756ec0f1ed500c8f6cb585a21c0caf5bca679 Mon Sep 17 00:00:00 2001 From: Tommi Komulainen Date: Mon, 27 Aug 2018 20:18:13 +0200 Subject: [PATCH] [macOS] fix conflicting keybindings for (Find and) Replace... ``` Play Scene Command+R (no change) Replace... Command+R => Option+Command+F Find Function... Option+Command+F => Ctrl+Command+J ``` On macOS Option+Command+F is commonly used for Find and Replace so use it instead to avoid conflicting with "Play Scene" And as Option+Command+F is currently used by "Find Function..." rebind the latter to Control+Command+J which is the Xcode shortcut for "Jump to Definition" Fixes #19817 --- editor/plugins/script_text_editor.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 4e7047ee38..53e17fedbc 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -1575,15 +1575,20 @@ void ScriptTextEditor::register_editor() { #ifdef OSX_ENABLED ED_SHORTCUT("script_text_editor/find_next", TTR("Find Next"), KEY_MASK_CMD | KEY_G); ED_SHORTCUT("script_text_editor/find_previous", TTR("Find Previous"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_G); + ED_SHORTCUT("script_text_editor/replace", TTR("Replace..."), KEY_MASK_ALT | KEY_MASK_CMD | KEY_F); #else ED_SHORTCUT("script_text_editor/find_next", TTR("Find Next"), KEY_F3); ED_SHORTCUT("script_text_editor/find_previous", TTR("Find Previous"), KEY_MASK_SHIFT | KEY_F3); -#endif ED_SHORTCUT("script_text_editor/replace", TTR("Replace..."), KEY_MASK_CMD | KEY_R); +#endif ED_SHORTCUT("script_text_editor/find_in_files", TTR("Find in files..."), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_F); +#ifdef OSX_ENABLED + ED_SHORTCUT("script_text_editor/goto_function", TTR("Goto Function..."), KEY_MASK_CTRL | KEY_MASK_CMD | KEY_J); +#else ED_SHORTCUT("script_text_editor/goto_function", TTR("Goto Function..."), KEY_MASK_ALT | KEY_MASK_CMD | KEY_F); +#endif ED_SHORTCUT("script_text_editor/goto_line", TTR("Goto Line..."), KEY_MASK_CMD | KEY_L); #ifdef OSX_ENABLED