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

Merge pull request #10479 from Paulb23/fix_not_scrolling_eof

Browse source 
Fixed not being able to scroll to eof
This commit is contained in:
Rémi Verschelde 2017-08-20 15:25:46 +02:00 committed by GitHub
commit 9720e94dce
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/gui/text_edit.cpp
View file

@ -487,7 +487,7 @@ void TextEdit::_notification(int p_what) {
int ascent = cache.font->get_ascent(); int ascent = cache.font->get_ascent();
int visible_rows = get_visible_rows(); int visible_rows = get_visible_rows() + 1;
int tab_w = cache.font->get_char_size(' ').width * indent_size; int tab_w = cache.font->get_char_size(' ').width * indent_size;
@ -3153,7 +3153,7 @@ int TextEdit::get_visible_rows() const {
int total = cache.size.height; int total = cache.size.height;
total -= cache.style_normal->get_minimum_size().height; total -= cache.style_normal->get_minimum_size().height;
total /= get_row_height(); total /= get_row_height();
return total + 1; return total;
} }
void TextEdit::adjust_viewport_to_cursor() { void TextEdit::adjust_viewport_to_cursor() {
@ -3172,7 +3172,7 @@ void TextEdit::adjust_viewport_to_cursor() {
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 (cursor.line >= (cursor.line_ofs + visible_rows)) if (cursor.line >= (cursor.line_ofs + visible_rows))
cursor.line_ofs = cursor.line - visible_rows + 1; cursor.line_ofs = cursor.line - visible_rows;
if (cursor.line < cursor.line_ofs) if (cursor.line < cursor.line_ofs)
cursor.line_ofs = cursor.line; cursor.line_ofs = cursor.line;