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

Merge pull request #13379 from ianb96/lastline_scroll_fix

Browse Source 
Scroll to Last Line fix
This commit is contained in:
Rémi Verschelde 2017-11-29 09:06:00 +01:00 committed by GitHub
commit 0f55d3767d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/text_edit.cpp
View File

@ -303,8 +303,6 @@ void TextEdit::_update_scrollbars() {
int total_rows = (is_hiding_enabled() ? get_total_unhidden_rows() : text.size()); int total_rows = (is_hiding_enabled() ? get_total_unhidden_rows() : text.size());
if (scroll_past_end_of_file_enabled) { if (scroll_past_end_of_file_enabled) {
total_rows += visible_rows - 1; total_rows += visible_rows - 1;
} else {
total_rows -= 1;
} }
int vscroll_pixels = v_scroll->get_combined_minimum_size().width; int vscroll_pixels = v_scroll->get_combined_minimum_size().width;
@ -3081,7 +3079,7 @@ void TextEdit::_scroll_down(real_t p_delta) {
if (smooth_scroll_enabled) { if (smooth_scroll_enabled) {
int max_v_scroll = get_total_unhidden_rows(); int max_v_scroll = get_total_unhidden_rows();
if (!scroll_past_end_of_file_enabled) { if (!scroll_past_end_of_file_enabled) {
max_v_scroll -= get_visible_rows() + 1; max_v_scroll -= get_visible_rows();
max_v_scroll = CLAMP(max_v_scroll, 0, get_total_unhidden_rows()); max_v_scroll = CLAMP(max_v_scroll, 0, get_total_unhidden_rows());
} }
@ -3139,7 +3137,7 @@ void TextEdit::_scroll_lines_down() {
// calculate the maximum vertical scroll position // calculate the maximum vertical scroll position
int max_v_scroll = get_total_unhidden_rows(); int max_v_scroll = get_total_unhidden_rows();
if (!scroll_past_end_of_file_enabled) { if (!scroll_past_end_of_file_enabled) {
max_v_scroll -= get_visible_rows() + 1; max_v_scroll -= get_visible_rows();
max_v_scroll = CLAMP(max_v_scroll, 0, get_total_unhidden_rows()); max_v_scroll = CLAMP(max_v_scroll, 0, get_total_unhidden_rows());
} }