From 3e738b17983a9f5b8dfebf9906b10ce64d96fb53 Mon Sep 17 00:00:00 2001 From: volzhs Date: Tue, 22 Oct 2019 06:05:10 +0900 Subject: Fix scrolling RichTextLabel with scroll_active=false --- scene/gui/rich_text_label.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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())) -- cgit v1.2.3