diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-08 08:28:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 08:28:29 +0100 |
| commit | b3b4727dff009dda0a65b8a013ec04d52a54b367 (patch) | |
| tree | e8b7c81a0d345951d2626fd50491ccfa48360b8b /scene | |
| parent | 28b317966f01cda96567e9eb0caef3be73c5f021 (diff) | |
| parent | 0485fb4df330fd4422b53f7ccbfb16a10994c1c1 (diff) | |
| download | redot-engine-b3b4727dff009dda0a65b8a013ec04d52a54b367.tar.gz | |
Merge pull request #14014 from kosz78/scroll-container-fix
Fix scroll enabled in case of content fit in scroll container
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/scroll_container.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index a71a1c5f92..ffe0db691f 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -354,6 +354,7 @@ void ScrollContainer::update_scrollbars() { if (!scroll_v || min.height <= size.height - hmin.height) { v_scroll->hide(); + v_scroll->set_max(0); scroll.y = 0; } else { @@ -366,6 +367,7 @@ void ScrollContainer::update_scrollbars() { if (!scroll_h || min.width <= size.width - vmin.width) { h_scroll->hide(); + h_scroll->set_max(0); scroll.x = 0; } else { |