diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-01-13 11:23:05 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-01-13 11:23:05 -0300 |
| commit | 823d7ae3b554100fc35c6223568452c8fa7adf11 (patch) | |
| tree | c2feed7fcbf86d534dde179bcc2e1b924d0e2187 /scene/gui | |
| parent | 7c7ab30c4ef74f3e7a90ab6d23d69d545fac7cf3 (diff) | |
| parent | 869f400179a32e951a44181165de48094693e280 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/grid_container.cpp | 1 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp index f54345cdb8..582693eb3a 100644 --- a/scene/gui/grid_container.cpp +++ b/scene/gui/grid_container.cpp @@ -226,5 +226,6 @@ Size2 GridContainer::get_minimum_size() const { GridContainer::GridContainer() { + set_stop_mouse(false); columns=1; } 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; |