From ec32c33799fe86362d64d1c16443a7e32e427dff Mon Sep 17 00:00:00 2001 From: sanikoyes Date: Tue, 13 Sep 2016 11:50:41 +0800 Subject: [PATCH] fix ScrollContainer cannot scroll when scroll bar is hidden (cherry picked from commit b548ef000927ea90306efc0808ec866bd09e4fe9) --- scene/gui/scroll_container.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 0fa2856ca4b..479bb96fe2d 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)