summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvolzhs <volzhs@gmail.com>2019-10-22 06:05:10 +0900
committervolzhs <volzhs@gmail.com>2019-10-22 06:05:10 +0900
commit3e738b17983a9f5b8dfebf9906b10ce64d96fb53 (patch)
tree79bdd06385335feec401a361fc7e49b147059f6b
parent48d3458f74ee3a5c0596c905b72b52af612cde87 (diff)
Fix scrolling RichTextLabel with scroll_active=false
-rw-r--r--scene/gui/rich_text_label.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
index 42cb89b2d6..5cb21921d0 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()))