diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-09-13 09:29:54 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-13 09:29:54 -0300 |
| commit | 527ae80dffb6e0f4398310d25ceed951fe848871 (patch) | |
| tree | 0746392935a75590287077cb001c67f51940feca | |
| parent | af355364b2973405aae3b7dd3748ebdfa123fdce (diff) | |
| parent | b548ef000927ea90306efc0808ec866bd09e4fe9 (diff) | |
Merge pull request #6473 from sanikoyes/Pr-ScrollContainer-expand-children-bug-fix
fix ScrollContainer cannot scroll when scroll bar is hidden
| -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 0fa2856ca4..479bb96fe2 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 (!h_scroll->is_visible()) { + if (!(scroll_h || 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 (!v_scroll->is_visible()) { + if (!(scroll_v || v_scroll->is_visible())) { r.pos.y=0; r.size.height=size.height; if (c->get_v_size_flags()&SIZE_EXPAND) |