Merge pull request #91275 from ajreckof/Fix-RichTextLabel-Scroll-Following-randomly-stops-working

akien-mga · akien-mga · commit c1f8d24f185f · 2024-04-29T10:10:38.000+02:00
Fix RichTextLabel "Scroll Following" randomly stops working.
diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp
@@ -1803,7 +1803,7 @@ void RichTextLabel::_scroll_changed(double) {
 		return;
 	}
 
-	if (scroll_follow && vscroll->get_value() >= (vscroll->get_max() - Math::round(vscroll->get_page()))) {
+	if (scroll_follow && vscroll->get_value() > (vscroll->get_max() - vscroll->get_page() - 1)) {
 		scroll_following = true;
 	} else {
 		scroll_following = false;
@@ -4121,7 +4121,7 @@ bool RichTextLabel::is_scroll_active() const {
 
 void RichTextLabel::set_scroll_follow(bool p_follow) {
 	scroll_follow = p_follow;
-	if (!vscroll->is_visible_in_tree() || vscroll->get_value() >= (vscroll->get_max() - vscroll->get_page())) {
+	if (!vscroll->is_visible_in_tree() || vscroll->get_value() > (vscroll->get_max() - vscroll->get_page() - 1)) {
 		scroll_following = true;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1803,7 +1803,7 @@ void RichTextLabel::_scroll_changed(double) {`
`1803`	`1803`	`return;`
`1804`	`1804`	`}`
`1805`	`1805`
`1806`		`- if (scroll_follow && vscroll->get_value() >= (vscroll->get_max() - Math::round(vscroll->get_page()))) {`
	`1806`	`+ if (scroll_follow && vscroll->get_value() > (vscroll->get_max() - vscroll->get_page() - 1)) {`
`1807`	`1807`	`scroll_following = true;`
`1808`	`1808`	`} else {`
`1809`	`1809`	`scroll_following = false;`
`@@ -4121,7 +4121,7 @@ bool RichTextLabel::is_scroll_active() const {`
`4121`	`4121`
`4122`	`4122`	`void RichTextLabel::set_scroll_follow(bool p_follow) {`
`4123`	`4123`	`scroll_follow = p_follow;`
`4124`		`- if (!vscroll->is_visible_in_tree() \|\| vscroll->get_value() >= (vscroll->get_max() - vscroll->get_page())) {`
	`4124`	`+ if (!vscroll->is_visible_in_tree() \|\| vscroll->get_value() > (vscroll->get_max() - vscroll->get_page() - 1)) {`
`4125`	`4125`	`scroll_following = true;`
`4126`	`4126`	`}`
`4127`	`4127`	`}`