diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-01-13 10:50:33 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-13 10:50:33 -0300 |
commit | 869f400179a32e951a44181165de48094693e280 (patch) | |
tree | f5377efdb6eb9a9e1c4341b0d5cd19bde6b11dec /scene | |
parent | 2ef5a342e34df3863ac512bb3673eba28f15e9f4 (diff) | |
parent | ab0c79aaf10f9a04def256e547ff80e31b655b58 (diff) |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene')
-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; |