diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-14 13:31:16 +0800 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-14 13:31:16 +0800 |
| commit | 8a30feebbe676ab922515b58d0deec2f95aa104c (patch) | |
| tree | 55a208d7835022f6b876b4e45d5a482fbd4bd83f /scene/gui/text_edit.cpp | |
| parent | 2203ba5fe3f7cdca078dd557ec532b7f335d3670 (diff) | |
| parent | 9012cd408e240d6039120e56fdd47a0983890993 (diff) | |
| download | redot-engine-8a30feebbe676ab922515b58d0deec2f95aa104c.tar.gz | |
Merge remote-tracking branch 'upstream/master' into x11-window-management
Conflicts:
platform/x11/detect.py
Diffstat (limited to 'scene/gui/text_edit.cpp')
| -rw-r--r-- | scene/gui/text_edit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index d589b93049..8855627bb4 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -298,7 +298,7 @@ void TextEdit::_update_scrollbars() { int hscroll_rows = ((hmin.height-1)/get_row_height())+1; int visible_rows = get_visible_rows(); - int total_rows = text.size() * cache.line_spacing; + int total_rows = text.size(); int vscroll_pixels = v_scroll->get_combined_minimum_size().width; int visible_width = size.width - cache.style_normal->get_minimum_size().width; |