diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-04 11:03:31 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-04 11:03:31 -0300 |
| commit | a8bcb96ad4c940c93d3fd561ddd29ce38b529303 (patch) | |
| tree | 36c566d8af17af871262f501bc21c4870cc00d48 /scene/gui/text_edit.cpp | |
| parent | f39473ae7adf11e16b2a7aae2f84764a3225752b (diff) | |
-Fix shortcuts for OSX code completion, fixes #1111
-Fixed how translation fallbacks works, fixes #1011
Diffstat (limited to 'scene/gui/text_edit.cpp')
| -rw-r--r-- | scene/gui/text_edit.cpp | 4 |
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; |