godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 17:36:07 +00:00
Code Releases Wiki Activity

fix ScrollContainer cannot scroll when scroll bar is hidden

Browse Source
This commit is contained in:
sanikoyes
2016-09-13 11:50:41 +08:00
parent 291e985882
commit b548ef0009
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

@@ -228,14 +228,14 @@ void ScrollContainer::_notification(int p_what) {
child_max_size.y = MAX(child_max_size.y, minsize.y); child_max_size.y = MAX(child_max_size.y, minsize.y);
Rect2 r = Rect2(-scroll,minsize); Rect2 r = Rect2(-scroll,minsize);
if (!h_scroll->is_visible()) { if (!(scroll_h || h_scroll->is_visible())) {
r.pos.x=0; r.pos.x=0;
if (c->get_h_size_flags()&SIZE_EXPAND) if (c->get_h_size_flags()&SIZE_EXPAND)
r.size.width=MAX(size.width,minsize.width); r.size.width=MAX(size.width,minsize.width);
else else
r.size.width=minsize.width; r.size.width=minsize.width;
} }
if (!v_scroll->is_visible()) { if (!(scroll_v || v_scroll->is_visible())) {
r.pos.y=0; r.pos.y=0;
r.size.height=size.height; r.size.height=size.height;
if (c->get_v_size_flags()&SIZE_EXPAND) if (c->get_v_size_flags()&SIZE_EXPAND)