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

Re-enable scrolling via selecting code beyond edges in text_edit.cpp

Browse Source
This commit is contained in:
robojumper 2018-06-14 09:10:30 +02:00
parent 4da621603e
commit 4ba6755324
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scene/gui/text_edit.cpp
View File

@ -426,6 +426,9 @@ void TextEdit::_update_scrollbars() {
void TextEdit::_click_selection_held() { void TextEdit::_click_selection_held() {
// Warning: is_mouse_button_pressed(BUTTON_LEFT) returns false for double+ clicks, so this doesn't work for MODE_WORD
// and MODE_LINE. However, moving the mouse triggers _gui_input, which calls these functions too, so that's not a huge problem.
// I'm unsure if there's an actual fix that doesn't have a ton of side effects.
if (Input::get_singleton()->is_mouse_button_pressed(BUTTON_LEFT) && selection.selecting_mode != Selection::MODE_NONE) { if (Input::get_singleton()->is_mouse_button_pressed(BUTTON_LEFT) && selection.selecting_mode != Selection::MODE_NONE) {
switch (selection.selecting_mode) { switch (selection.selecting_mode) {
case Selection::MODE_POINTER: { case Selection::MODE_POINTER: {
@ -455,7 +458,7 @@ void TextEdit::_update_selection_mode_pointer() {
select(selection.selecting_line, selection.selecting_column, row, col); select(selection.selecting_line, selection.selecting_column, row, col);
cursor_set_line(row, false); cursor_set_line(row, false);
cursor_set_column(col, false); cursor_set_column(col);
update(); update();
click_select_held->start(); click_select_held->start();
@ -496,21 +499,24 @@ void TextEdit::_update_selection_mode_word() {
selection.selected_word_beg = beg; selection.selected_word_beg = beg;
selection.selected_word_end = end; selection.selected_word_end = end;
selection.selected_word_origin = beg; selection.selected_word_origin = beg;
cursor_set_line(selection.to_line, false);
cursor_set_column(selection.to_column); cursor_set_column(selection.to_column);
} else { } else {
if ((col <= selection.selected_word_origin && row == selection.selecting_line) || row < selection.selecting_line) { if ((col <= selection.selected_word_origin && row == selection.selecting_line) || row < selection.selecting_line) {
selection.selecting_column = selection.selected_word_end; selection.selecting_column = selection.selected_word_end;
select(row, beg, selection.selecting_line, selection.selected_word_end); select(row, beg, selection.selecting_line, selection.selected_word_end);
cursor_set_line(selection.from_line, false);
cursor_set_column(selection.from_column); cursor_set_column(selection.from_column);
} else { } else {
selection.selecting_column = selection.selected_word_beg; selection.selecting_column = selection.selected_word_beg;
select(selection.selecting_line, selection.selected_word_beg, row, end); select(selection.selecting_line, selection.selected_word_beg, row, end);
cursor_set_line(selection.to_line, false);
cursor_set_column(selection.to_column); cursor_set_column(selection.to_column);
} }
} }
cursor_set_line(row, false);
update(); update();
click_select_held->start(); click_select_held->start();
} }
@ -531,7 +537,7 @@ void TextEdit::_update_selection_mode_line() {
selection.selecting_column = 0; selection.selecting_column = 0;
col = text[row].length(); col = text[row].length();
} }
cursor_set_column(0, false); cursor_set_column(0);
select(selection.selecting_line, selection.selecting_column, row, col); select(selection.selecting_line, selection.selecting_column, row, col);
update(); update();
@ -1660,14 +1666,17 @@ void TextEdit::_get_mouse_pos(const Point2i &p_mouse, int &r_row, int &r_col) co
rows /= get_row_height(); rows /= get_row_height();
rows += get_v_scroll_offset(); rows += get_v_scroll_offset();
int first_vis_line = get_first_visible_line(); int first_vis_line = get_first_visible_line();
int last_vis_line = get_last_visible_line();
int row = first_vis_line + Math::floor(rows); int row = first_vis_line + Math::floor(rows);
int wrap_index = 0; int wrap_index = 0;
if (is_wrap_enabled() || is_hiding_enabled()) { if (is_wrap_enabled() || is_hiding_enabled()) {
int f_ofs = num_lines_from_rows(first_vis_line, cursor.wrap_ofs, rows + 1, wrap_index) - 1; int f_ofs = num_lines_from_rows(first_vis_line, cursor.wrap_ofs, rows + (1 * SGN(rows)), wrap_index) - 1;
row = first_vis_line + f_ofs; if (rows < 0)
row = CLAMP(row, 0, get_last_visible_line() + 1); row = first_vis_line - f_ofs;
else
row = first_vis_line + f_ofs;
} }
if (row < 0) if (row < 0)