summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorKonstantin Zaitsev <konstantin.zaitsev@xored.com>2017-12-06 11:00:46 +0700
committerKonstantin Zaitsev <konstantin.zaitsev@xored.com>2017-12-06 11:00:46 +0700
commit0485fb4df330fd4422b53f7ccbfb16a10994c1c1 (patch)
treeda2173927f1708cd7307b58006d5cef74a1c5add /scene
parent7b02f5591d2a4c4d2d7da723b1303a99b6c4f168 (diff)
Fix scroll enabled in case of content fit in scroll container
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/scroll_container.cpp2
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 {