diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-13 21:28:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-13 21:28:32 +0100 |
| commit | 3c646350031d4765cf9064b426cb763ef4acb0da (patch) | |
| tree | a757a448e638eadcb681f22c8685db88338b6113 /scene/gui | |
| parent | f1a8520c4541e86eb8e2bf932035a12f8bb5032f (diff) | |
| parent | f2f18261c390646f58e7a21a4437002e63e34cc3 (diff) | |
Merge pull request #12903 from YeldhamDev/scrollcontainer_arrangement
Small arrangement in ScrollContainer
Diffstat (limited to 'scene/gui')
| -rw-r--r-- | scene/gui/scroll_container.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 1ad1e3f638..9022d67a4a 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -347,12 +347,11 @@ void ScrollContainer::update_scrollbars() { } else { v_scroll->show(); + v_scroll->set_max(min.height); + v_scroll->set_page(size.height - hmin.height); scroll.y = v_scroll->get_value(); } - v_scroll->set_max(min.height); - v_scroll->set_page(size.height - hmin.height); - if (!scroll_h || min.width <= size.width - vmin.width) { h_scroll->hide(); |