summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-11-26 10:45:35 +0100
committerGitHub <noreply@github.com>2018-11-26 10:45:35 +0100
commitf98a38540d9121b1ce92b349a7aec9f6892e0984 (patch)
treec79f6cb97ddc9ca4018bde7add0ebf28b82fa90d
parent7b2ac2832659c2c64e3ad3c8b077dfa72b7daf15 (diff)
parent9e57c359b769bef1a5659079b7c4fdccee08d4cb (diff)
Merge pull request #23943 from Paulb23/fix_smoothscroll_jitter_issue_23314
Fix scroll bar lock when smooth scroll enabled, issue 23314
-rw-r--r--scene/gui/scroll_bar.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp
index 07380f45cc..0e68476439 100644
--- a/scene/gui/scroll_bar.cpp
+++ b/scene/gui/scroll_bar.cpp
@@ -330,6 +330,8 @@ void ScrollBar::_notification(int p_what) {
if (Math::abs(vel) >= dist) {
set_value(target_scroll);
+ scrolling = false;
+ set_physics_process_internal(false);
} else {
set_value(get_value() + vel);
}