asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #15421 from ianb96/center_viewport_fix

Browse source 
Fix center_viewport_to_cursor out of size error
This commit is contained in:
Rémi Verschelde 2018-01-07 00:31:09 +01:00 committed by GitHub
commit 7159f533c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/gui/text_edit.cpp
View file

@ -3641,9 +3641,10 @@ void TextEdit::center_viewport_to_cursor() {
int visible_rows = get_visible_rows(); int visible_rows = get_visible_rows();
if (h_scroll->is_visible_in_tree()) if (h_scroll->is_visible_in_tree())
visible_rows -= ((h_scroll->get_combined_minimum_size().height - 1) / get_row_height()); visible_rows -= ((h_scroll->get_combined_minimum_size().height - 1) / get_row_height());
if (text.size() >= visible_rows) {
int max_ofs = text.size() - (scroll_past_end_of_file_enabled ? 1 : num_lines_from(text.size() - 1, -visible_rows)); int max_ofs = text.size() - (scroll_past_end_of_file_enabled ? 1 : MAX(num_lines_from(text.size() - 1, -visible_rows), 0));
cursor.line_ofs = CLAMP(cursor.line - num_lines_from(cursor.line - visible_rows / 2, -visible_rows / 2), 0, max_ofs); cursor.line_ofs = CLAMP(cursor.line - num_lines_from(MAX(cursor.line - visible_rows / 2, 0), -visible_rows / 2), 0, max_ofs);
}
int cursor_x = get_column_x_offset(cursor.column, text[cursor.line]); int cursor_x = get_column_x_offset(cursor.column, text[cursor.line]);
if (cursor_x > (cursor.x_ofs + visible_width)) if (cursor_x > (cursor.x_ofs + visible_width))