diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-04-04 13:50:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-04 13:50:52 +0200 |
| commit | f1592cb3da3f8149cea72026b4ce2c61a753c25c (patch) | |
| tree | a56c22385d9f905e13fd18588dbb6c9a7efd87c3 /scene/gui/text_edit.cpp | |
| parent | 10d9e479491c25a350a8ed191987dd36ed43c073 (diff) | |
| parent | 0d17903bd5996a4a52729c5876fbad51c64becaf (diff) | |
Merge pull request #58010 from jmb462/fix-TextEdit-v_scroll_speed
Diffstat (limited to 'scene/gui/text_edit.cpp')
| -rw-r--r-- | scene/gui/text_edit.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 3c80e3f987..66c3048f32 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -471,6 +471,11 @@ void TextEdit::_notification(int p_what) { // To ensure minimap is responsive override the speed setting. double vel = ((target_y / dist) * ((minimap_clicked) ? 3000 : v_scroll_speed)) * get_physics_process_delta_time(); + // Prevent too small velocity to block scrolling + if (Math::abs(vel) < v_scroll->get_step()) { + vel = v_scroll->get_step() * SIGN(vel); + } + if (Math::abs(vel) >= dist) { set_v_scroll(target_v_scroll); scrolling = false; @@ -4390,6 +4395,8 @@ int TextEdit::get_h_scroll() const { } void TextEdit::set_v_scroll_speed(float p_speed) { + // Prevent setting a vertical scroll speed value under 1.0 + ERR_FAIL_COND(p_speed < 1.0); v_scroll_speed = p_speed; } |