diff options
| author | Juan Linietsky | 2016-09-10 12:14:33 -0300 |
|---|---|---|
| committer | GitHub | 2016-09-10 12:14:33 -0300 |
| commit | 026c7913cf6f38b948d66484d97d7841fa1c9f16 (patch) | |
| tree | 1e515b3ffe49ec158021967c419bd2ad7cafa6fe /scene/gui/scroll_container.cpp | |
| parent | e2aad59b59e9cf9791bd7b21383d6c85c4b46203 (diff) | |
| parent | 853161a0000b54bdb85cb57d2e07020bed16589e (diff) | |
| download | godot-026c7913cf6f38b948d66484d97d7841fa1c9f16.tar.gz godot-026c7913cf6f38b948d66484d97d7841fa1c9f16.tar.zst godot-026c7913cf6f38b948d66484d97d7841fa1c9f16.zip | |
Diffstat (limited to 'scene/gui/scroll_container.cpp')
| -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 190e8e141..0fa2856ca 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -228,14 +228,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) { + if (!h_scroll->is_visible()) { 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) { + if (!v_scroll->is_visible()) { r.pos.y=0; r.size.height=size.height; if (c->get_v_size_flags()&SIZE_EXPAND) |