godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #25606 from Paulb23/fix_textedit_scroll_selection

Browse Source 
Fixed selection being activated when using scroll lines.
This commit is contained in:
Rémi Verschelde 2019-02-06 11:27:16 +01:00 committed by GitHub
commit 25027d60f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scene/gui/text_edit.cpp
View File

@ -2645,24 +2645,26 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
} }
case KEY_UP: { case KEY_UP: {
if (k->get_shift())
_pre_shift_selection();
if (k->get_alt()) { if (k->get_alt()) {
scancode_handled = false; scancode_handled = false;
break; break;
} }
#ifndef APPLE_STYLE_KEYS #ifndef APPLE_STYLE_KEYS
if (k->get_command()) { if (k->get_command()) {
_scroll_lines_up();
break;
}
#else #else
if (k->get_command() && k->get_alt()) { if (k->get_command() && k->get_alt()) {
#endif
_scroll_lines_up(); _scroll_lines_up();
break; break;
} }
if (k->get_shift()) {
_pre_shift_selection();
}
#ifdef APPLE_STYLE_KEYS
if (k->get_command()) { if (k->get_command()) {
cursor_set_line(0); cursor_set_line(0);
} else } else
#endif #endif
@ -2696,24 +2698,24 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
} }
case KEY_DOWN: { case KEY_DOWN: {
if (k->get_shift())
_pre_shift_selection();
if (k->get_alt()) { if (k->get_alt()) {
scancode_handled = false; scancode_handled = false;
break; break;
} }
#ifndef APPLE_STYLE_KEYS #ifndef APPLE_STYLE_KEYS
if (k->get_command()) { if (k->get_command()) {
_scroll_lines_down();
break;
}
#else #else
if (k->get_command() && k->get_alt()) { if (k->get_command() && k->get_alt()) {
#endif
_scroll_lines_down(); _scroll_lines_down();
break; break;
} }
if (k->get_shift()) {
_pre_shift_selection();
}
#ifdef APPLE_STYLE_KEYS
if (k->get_command()) { if (k->get_command()) {
cursor_set_line(get_last_unhidden_line(), true, false, 9999); cursor_set_line(get_last_unhidden_line(), true, false, 9999);
} else } else