From b602096b9b5a31ff0e8ac0123a0210189179bbc6 Mon Sep 17 00:00:00 2001 From: Pawel Kowal Date: Wed, 25 Jan 2017 21:21:44 +0100 Subject: Fix #7011 ScrollContainer takes into account child's EXPAND flag when scrolling is enabled (cherry picked from commit e9316a009e08e8fe9aa961a0ccef2a77ba7133fc) --- 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 b3ed9b209a..46312933a7 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -236,14 +236,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 || h_scroll->is_visible_in_tree())) { + if (!scroll_h || (!h_scroll->is_visible_in_tree() && c->get_h_size_flags()&SIZE_EXPAND)) { 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 || v_scroll->is_visible_in_tree())) { + if (!scroll_v || (!v_scroll->is_visible_in_tree() && c->get_v_size_flags()&SIZE_EXPAND)) { r.pos.y=0; r.size.height=size.height; if (c->get_v_size_flags()&SIZE_EXPAND) -- cgit v1.2.3