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

LineEdit: Fix and improve selection behaviour 

(cherry picked from commit 99612207b7)
This commit is contained in:
Ignacio Etcheverry 2016-06-18 16:14:43 +02:00 committed by Rémi Verschelde
parent a04a78c7f6
commit 18cb1f8e44
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
scene/gui/line_edit.cpp
View File

@ -46,26 +46,36 @@ void LineEdit::_input_event(InputEvent p_event) {
if (b.pressed) { if (b.pressed) {
shift_selection_check_pre(b.mod.shift);
set_cursor_at_pixel_pos(b.x); set_cursor_at_pixel_pos(b.x);
if (b.doubleclick) { if (b.mod.shift) {
selection.enabled=true; selection_fill_at_cursor();
selection.begin=0;
selection.end=text.length();
selection.doubleclick=true;
}
selection.drag_attempt=false;
if ((cursor_pos<selection.begin) || (cursor_pos>selection.end) || !selection.enabled) {
selection_clear();
selection.cursor_start=cursor_pos;
selection.creating=true; selection.creating=true;
} else if (selection.enabled) {
selection.drag_attempt=true; } else {
if (b.doubleclick) {
selection.enabled=true;
selection.begin=0;
selection.end=text.length();
selection.doubleclick=true;
}
selection.drag_attempt=false;
if ((cursor_pos<selection.begin) || (cursor_pos>selection.end) || !selection.enabled) {
selection_clear();
selection.cursor_start=cursor_pos;
selection.creating=true;
} else if (selection.enabled) {
selection.drag_attempt=true;
}
} }
// if (!editable) // if (!editable)
@ -345,8 +355,6 @@ void LineEdit::_input_event(InputEvent p_event) {
} }
} }
selection.old_shift=k.mod.shift;
update(); update();
} }
@ -561,7 +569,7 @@ void LineEdit::paste_text() {
void LineEdit::shift_selection_check_pre(bool p_shift) { void LineEdit::shift_selection_check_pre(bool p_shift) {
if (!selection.old_shift && p_shift) { if (!selection.enabled && p_shift) {
selection.cursor_start=cursor_pos; selection.cursor_start=cursor_pos;
} }
if (!p_shift) if (!p_shift)
@ -803,7 +811,6 @@ void LineEdit::selection_clear() {
selection.cursor_start=0; selection.cursor_start=0;
selection.enabled=false; selection.enabled=false;
selection.creating=false; selection.creating=false;
selection.old_shift=false;
selection.doubleclick=false; selection.doubleclick=false;
update(); update();
} }
@ -929,7 +936,6 @@ void LineEdit::select(int p_from, int p_to) {
selection.begin=p_from; selection.begin=p_from;
selection.end=p_to; selection.end=p_to;
selection.creating=false; selection.creating=false;
selection.old_shift=false;
selection.doubleclick=false; selection.doubleclick=false;
update(); update();
} }

1
scene/gui/line_edit.h
View File

@ -67,7 +67,6 @@ private:
int cursor_start; int cursor_start;
bool enabled; bool enabled;
bool creating; bool creating;
bool old_shift;
bool doubleclick; bool doubleclick;
bool drag_attempt; bool drag_attempt;
} selection; } selection;