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

Merge pull request #78833 from bruvzg/scroll_fix 

[RTL] Fix multithreaded scrollbar visibility update.
This commit is contained in:
Rémi Verschelde 2023-06-29 15:43:03 +02:00
parent ab430b0b4a ec97c7c1d9
commit 46424488ed
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scene/gui/rich_text_label.cpp
View File

@ -2898,21 +2898,33 @@ void RichTextLabel::_process_line_caches() {
float total_height = 0; float total_height = 0;
if (fi != 0) { if (fi != 0) {
// Update fonts. int sr = MIN(main->first_invalid_font_line.load(), main->first_resized_line.load());
// Update fonts.
for (int i = main->first_invalid_font_line.load(); i < fi; i++) { for (int i = main->first_invalid_font_line.load(); i < fi; 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);
main->first_invalid_font_line.store(i);
if (stop_thread.load()) {
return;
}
} }
// Resize lines without reshaping. // Resize lines without reshaping.
int sr = MIN(main->first_invalid_font_line.load(), main->first_resized_line.load()); if (sr != 0) {
main->first_invalid_font_line.store(fi); total_height = _calculate_line_vertical_offset(main->lines[sr - 1]);
}
for (int i = sr; i < fi; i++) { for (int i = sr; i < fi; i++) {
total_height = _resize_line(main, i, theme_cache.normal_font, theme_cache.normal_font_size, text_rect.get_size().width - scroll_w, total_height); total_height = _resize_line(main, i, theme_cache.normal_font, theme_cache.normal_font_size, text_rect.get_size().width - scroll_w, total_height);
total_height = _update_scroll_exceeds(total_height, ctrl_height, text_rect.get_size().width - scroll_w, i, old_scroll, text_rect.size.height); total_height = _update_scroll_exceeds(total_height, ctrl_height, text_rect.get_size().width - scroll_w, i, old_scroll, text_rect.size.height);
main->first_resized_line.store(i); main->first_resized_line.store(i);
if (stop_thread.load()) {
return;
}
} }
} }