diff options
| author | Pawel Kowal | 2017-01-25 21:21:44 +0100 |
|---|---|---|
| committer | Pawel Kowal | 2017-01-26 10:02:19 +0100 |
| commit | e9316a009e08e8fe9aa961a0ccef2a77ba7133fc (patch) | |
| tree | 94a0bfce74baf3fba73147a216eae74c7ad924be /scene/gui/scroll_container.cpp | |
| parent | 9038a96e49300ea5cc427ab8bbc6a5bd5de434cb (diff) | |
| download | godot-e9316a009e08e8fe9aa961a0ccef2a77ba7133fc.tar.gz godot-e9316a009e08e8fe9aa961a0ccef2a77ba7133fc.tar.zst godot-e9316a009e08e8fe9aa961a0ccef2a77ba7133fc.zip | |
Fix #7011 ScrollContainer takes into account child's EXPAND flag when scrolling is enabled
Diffstat (limited to '')
| -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 bad478a74..c92f57392 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())) { + if (!scroll_h || (!h_scroll->is_visible() && 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())) { + if (!scroll_v || (!v_scroll->is_visible() && c->get_v_size_flags()&SIZE_EXPAND)) { r.pos.y=0; r.size.height=size.height; if (c->get_v_size_flags()&SIZE_EXPAND) |