-Fix shortcuts for OSX code completion, fixes #1111

-Fixed how translation fallbacks works, fixes #1011

1 files changed, 4 insertions, 0 deletions

diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 8afcbf3283..50a440e91c 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -1957,7 +1957,11 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
 					update();
 				} break;
 				case KEY_SPACE: {
+#ifdef OSX_ENABLED
+					if (completion_enabled && k.mod.meta) { //cmd-space is spotlight shortcut in OSX
+#else
 					if (completion_enabled && k.mod.command) {
+#endif
 						
 						query_code_comple();
 						scancode_handled=true;