noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

-Fixed a bug in scrollcontainer not respecting expand flag

Browse Source 
If you relied on this, make sure the children of your scrollcontainer
is set to expand with the expand flag in either vertical or horizontal axis
This commit is contained in:
Juan Linietsky
2015-10-25 20:08:18 -03:00
parent d123c89c58
commit 8f84f4117c
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scene/gui/scroll_container.cpp
View File

@@ -195,11 +195,19 @@ void ScrollContainer::_notification(int p_what) {
Rect2 r = Rect2(-scroll,minsize);
if (!scroll_h) {
r.pos.x=0;
r.size.width=size.width;
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) {
r.pos.y=0;
r.size.height=size.height;
if (c->get_v_size_flags()&SIZE_EXPAND)
r.size.height=MAX(size.height,minsize.height);
else
r.size.height=minsize.height;
}
fit_child_in_rect(c,r);
}