diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-24 21:14:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-24 21:14:47 +0200 |
| commit | 06c6516604696c294df2e374ba8433efee54912c (patch) | |
| tree | e981eca861f19bfe7779f1196c830e492a48670a | |
| parent | 118f54aeeb3c2f67e721d261edf4f96dce7cf0d4 (diff) | |
| parent | f1e75527222b0e01e04c64db26e5f1e0a0017922 (diff) | |
Merge pull request #5379 from neikeq/pr-issue-5375
Fix weird deselection behaviour with text field
| -rw-r--r-- | scene/gui/line_edit.cpp | 3 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index fc5e82d36a..579a6e2f0a 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -298,6 +298,9 @@ void LineEdit::_input_event(InputEvent p_event) { } case KEY_LEFT: { +#ifndef APPLE_STYLE_KEYS + if (!k.mod.alt) +#endif shift_selection_check_pre(k.mod.shift); #ifdef APPLE_STYLE_KEYS diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 9342d077eb..6fd6137ac8 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -2065,6 +2065,12 @@ void TextEdit::_input_event(const InputEvent& p_input_event) { if (k.mod.shift) _pre_shift_selection(); +#ifdef APPLE_STYLE_KEYS + else +#else + else if (!k.mod.alt) +#endif + deselect(); #ifdef APPLE_STYLE_KEYS if (k.mod.command) { @@ -2118,6 +2124,12 @@ void TextEdit::_input_event(const InputEvent& p_input_event) { if (k.mod.shift) _pre_shift_selection(); +#ifdef APPLE_STYLE_KEYS + else +#else + else if (!k.mod.alt) +#endif + deselect(); #ifdef APPLE_STYLE_KEYS if (k.mod.command) { |