summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTommi Komulainen <tommi.komulainen@iki.fi>2018-08-27 20:35:47 +0200
committerTommi Komulainen <tommi.komulainen@iki.fi>2018-08-27 20:39:43 +0200
commitc2f0b4c9c638e628a36b91f9c797fd0ba4cd020c (patch)
treed4082f2c451384b16254a7d5f1ed693a2be2585b
parent0565adb20ff01a758c5ae8e4534a2cb7f07952df (diff)
[macOS] change "Complete Symbol" shortcut to not conflict with Spotlight
The default shortcut for Spotlight search is Command+Space so try not to use it. Instead use Ctrl+Space similar to Xcode.
-rw-r--r--editor/plugins/script_text_editor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 4e7047ee38..01cc1f7feb 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -1549,10 +1549,11 @@ void ScriptTextEditor::register_editor() {
ED_SHORTCUT("script_text_editor/unfold_all_lines", TTR("Unfold All Lines"), 0);
#ifdef OSX_ENABLED
ED_SHORTCUT("script_text_editor/clone_down", TTR("Clone Down"), KEY_MASK_SHIFT | KEY_MASK_CMD | KEY_C);
+ ED_SHORTCUT("script_text_editor/complete_symbol", TTR("Complete Symbol"), KEY_MASK_CTRL | KEY_SPACE);
#else
ED_SHORTCUT("script_text_editor/clone_down", TTR("Clone Down"), KEY_MASK_CMD | KEY_B);
-#endif
ED_SHORTCUT("script_text_editor/complete_symbol", TTR("Complete Symbol"), KEY_MASK_CMD | KEY_SPACE);
+#endif
ED_SHORTCUT("script_text_editor/trim_trailing_whitespace", TTR("Trim Trailing Whitespace"), KEY_MASK_CMD | KEY_MASK_ALT | KEY_T);
ED_SHORTCUT("script_text_editor/convert_indent_to_spaces", TTR("Convert Indent To Spaces"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_Y);
ED_SHORTCUT("script_text_editor/convert_indent_to_tabs", TTR("Convert Indent To Tabs"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_X);