Browse Source

Merge pull request #32965 from volzhs/richtextlabel-scroll-active

Fix scrolling RichTextLabel with scroll_active=false
Rémi Verschelde 5 years ago
parent
commit
b365dc3441
1 changed files with 1 additions and 1 deletions
  1. 1 1
      scene/gui/rich_text_label.cpp

+ 1 - 1
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()))