diff options
| author | Pawel Kowal <pkowal1982@gmail.com> | 2016-07-27 20:24:10 +0200 |
|---|---|---|
| committer | Pawel Kowal <pkowal1982@gmail.com> | 2016-07-27 20:24:10 +0200 |
| commit | 853161a0000b54bdb85cb57d2e07020bed16589e (patch) | |
| tree | 9abe575870e78f45d2de1e2479fdf3555a8e7a40 /scene | |
| parent | 6273ec901faec2823c8f4801244d1cffbbe9b118 (diff) | |
ScrollContainer expand children bug fix
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/scroll_container.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 190e8e141f..0fa2856ca4 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -228,14 +228,14 @@ void ScrollContainer::_notification(int p_what) { child_max_size.y = MAX(child_max_size.y, minsize.y); Rect2 r = Rect2(-scroll,minsize); - if (!scroll_h) { + if (!h_scroll->is_visible()) { r.pos.x=0; if (c->get_h_size_flags()&SIZE_EXPAND) r.size.width=MAX(size.width,minsize.width); else r.size.width=minsize.width; } - if (!scroll_v) { + if (!v_scroll->is_visible()) { r.pos.y=0; r.size.height=size.height; if (c->get_v_size_flags()&SIZE_EXPAND) |