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

Merge pull request #68792 from bruvzg/rtl_scroll

Browse Source 
Fix multithreaded RTL resetting scroll position on resize.
This commit is contained in:
Rémi Verschelde 2022-11-17 20:57:59 +01:00
commit b41ba331d4
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/gui/rich_text_label.cpp
View File

@ -2689,6 +2689,7 @@ bool RichTextLabel::_validate_line_caches() {
int ctrl_height = get_size().height; int ctrl_height = get_size().height;
// Update fonts. // Update fonts.
float old_scroll = vscroll->get_value();
if (main->first_invalid_font_line.load() != (int)main->lines.size()) { if (main->first_invalid_font_line.load() != (int)main->lines.size()) {
for (int i = main->first_invalid_font_line.load(); i < (int)main->lines.size(); i++) { for (int i = main->first_invalid_font_line.load(); i < (int)main->lines.size(); i++) {
_update_line_font(main, i, theme_cache.normal_font, theme_cache.normal_font_size); _update_line_font(main, i, theme_cache.normal_font, theme_cache.normal_font_size);
@ -2698,6 +2699,7 @@ bool RichTextLabel::_validate_line_caches() {
} }
if (main->first_resized_line.load() == (int)main->lines.size()) { if (main->first_resized_line.load() == (int)main->lines.size()) {
vscroll->set_value(old_scroll);
return true; return true;
} }
@ -2736,6 +2738,8 @@ bool RichTextLabel::_validate_line_caches() {
vscroll->set_page(text_rect.size.height); vscroll->set_page(text_rect.size.height);
if (scroll_follow && scroll_following) { if (scroll_follow && scroll_following) {
vscroll->set_value(total_height); vscroll->set_value(total_height);
} else {
vscroll->set_value(old_scroll);
} }
updating_scroll = false; updating_scroll = false;