diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-10-22 20:39:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-22 20:39:12 +0200 |
| commit | b365dc344149eb6156342f12c4a2d00cca5727e3 (patch) | |
| tree | ff18ec90d657b95021f52629e204d37fc1745f5f /scene | |
| parent | 4952e19ad086764d87d1f6b97870d617102390e5 (diff) | |
| parent | 3e738b17983a9f5b8dfebf9906b10ce64d96fb53 (diff) | |
Merge pull request #32965 from volzhs/richtextlabel-scroll-active
Fix scrolling RichTextLabel with scroll_active=false
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/rich_text_label.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 2ae60a17ea..0ce63a7c6f 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -859,7 +859,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int & void RichTextLabel::_scroll_changed(double) { - if (updating_scroll) + if (updating_scroll || !scroll_active) return; if (scroll_follow && vscroll->get_value() >= (vscroll->get_max() - vscroll->get_page())) |