summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-11-13 10:02:52 -0200
committerJuan Linietsky <reduzio@gmail.com>2014-11-13 10:02:52 -0200
commit56b30b31e4df887a5b7b5c70a87597d250482c1f (patch)
tree93f9c961ef75ff635f1a61c63dad39730eba6aab
parent43d0eddc3ce7e8de52278252c1ebbd37d52d0b5c (diff)
parent7d8e34c284e14533183b3b894fb4eaaac877349c (diff)
Merge pull request #880 from adolson/editor-shortcut-keys
allow Alt+arrow keys to pass through editor
-rw-r--r--scene/gui/text_edit.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 42d318131e..b95d271394 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -1360,6 +1360,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
#else
if (k.mod.alt) {
+ scancode_handled=false;
break;
} else if (k.mod.command) {
#endif
@@ -1404,6 +1405,7 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
} else if (k.mod.alt) {
#else
if (k.mod.alt) {
+ scancode_handled=false;
break;
} else if (k.mod.command) {
#endif
@@ -1439,8 +1441,10 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
if (k.mod.shift)
_pre_shift_selection();
- if (k.mod.alt)
+ if (k.mod.alt) {
+ scancode_handled=false;
break;
+ }
#ifdef APPLE_STYLE_KEYS
if (k.mod.command)
cursor_set_line(0);
@@ -1456,8 +1460,10 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
if (k.mod.shift)
_pre_shift_selection();
- if (k.mod.alt)
+ if (k.mod.alt) {
+ scancode_handled=false;
break;
+ }
#ifdef APPLE_STYLE_KEYS
if (k.mod.command)
cursor_set_line(text.size()-1);