godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7650 from pkowal1982/fix_7011

Browse Source 
Fix #7011 ScrollContainer takes into account child's EXPAND flag when scrolling is enabled
This commit is contained in:
Rémi Verschelde
2017-02-02 08:09:09 +01:00
committed by GitHub
parent 4a73e74ccb e9316a009e
commit 6b1d33ec71
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scene/gui/scroll_container.cpp
View File

@@ -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)