godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Fix scrolling RichTextLabel with scroll_active=false
This commit is contained in:
Rémi Verschelde 2019-10-22 20:39:12 +02:00 committed by GitHub
parent 4952e19ad0 3e738b1798
commit b365dc3441
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/rich_text_label.cpp
View File

@ -859,7 +859,7 @@ int RichTextLabel::_process_line(ItemFrame *p_frame, const Vector2 &p_ofs, int &
void RichTextLabel::_scroll_changed(double) { void RichTextLabel::_scroll_changed(double) {
if (updating_scroll) if (updating_scroll || !scroll_active)
return; return;
if (scroll_follow && vscroll->get_value() >= (vscroll->get_max() - vscroll->get_page())) if (scroll_follow && vscroll->get_value() >= (vscroll->get_max() - vscroll->get_page()))