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

Merge branch 'master' of https://github.com/okamstudio/godot

Browse source
This commit is contained in:
Juan Linietsky 2015-01-13 10:50:33 -03:00
commit 869f400179
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/gui/text_edit.cpp
View file

@ -298,7 +298,7 @@ void TextEdit::_update_scrollbars() {
int hscroll_rows = ((hmin.height-1)/get_row_height())+1; int hscroll_rows = ((hmin.height-1)/get_row_height())+1;
int visible_rows = get_visible_rows(); 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 vscroll_pixels = v_scroll->get_combined_minimum_size().width;
int visible_width = size.width - cache.style_normal->get_minimum_size().width; int visible_width = size.width - cache.style_normal->get_minimum_size().width;