summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-01-13 08:13:21 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-01-13 08:13:21 -0300
commitab0c79aaf10f9a04def256e547ff80e31b655b58 (patch)
tree925e19bf0415fa37f40b0f9115eec4f8df41e122 /scene/gui
parent30d36581100f0bf71c6d2502be9a03443bdf8708 (diff)
parent3a0f665c90ea645eaf56397dd873e2b8f0bcc38a (diff)
Merge pull request #1203 from marynate/PR-fix-textedit-totalrows
Total rows of text edit was calculated wrong, fixed issue #842
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/text_edit.cpp2
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;