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

Merge pull request #65498 from bruvzg/fix_rtl_updating

Browse Source 
[RTL] Stop threaded RTL auto-redrawing as soon as text processing is finished, instead of waiting for first redraw.
This commit is contained in:
Rémi Verschelde 2022-09-07 23:27:08 +02:00 committed by GitHub
commit 5803a1ddc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/gui/rich_text_label.cpp
View File

@ -2563,7 +2563,9 @@ bool RichTextLabel::_find_layout_subitem(Item *from, Item *to) {
void RichTextLabel::_thread_function(void *self) { void RichTextLabel::_thread_function(void *self) {
RichTextLabel *rtl = reinterpret_cast<RichTextLabel *>(self); RichTextLabel *rtl = reinterpret_cast<RichTextLabel *>(self);
rtl->set_physics_process_internal(true);
rtl->_process_line_caches(); rtl->_process_line_caches();
rtl->set_physics_process_internal(false);
rtl->updating.store(false); rtl->updating.store(false);
rtl->call_deferred(SNAME("queue_redraw")); rtl->call_deferred(SNAME("queue_redraw"));
} }
@ -2679,7 +2681,6 @@ bool RichTextLabel::_validate_line_caches() {
loaded.store(true); loaded.store(true);
thread.start(RichTextLabel::_thread_function, reinterpret_cast<void *>(this)); thread.start(RichTextLabel::_thread_function, reinterpret_cast<void *>(this));
loading_started = OS::get_singleton()->get_ticks_msec(); loading_started = OS::get_singleton()->get_ticks_msec();
set_physics_process_internal(true);
return false; return false;
} else { } else {
_process_line_caches(); _process_line_caches();
@ -4367,12 +4368,12 @@ int RichTextLabel::get_visible_paragraph_count() const {
} }
void RichTextLabel::scroll_to_line(int p_line) { void RichTextLabel::scroll_to_line(int p_line) {
_validate_line_caches();
if (p_line <= 0) { if (p_line <= 0) {
vscroll->set_value(0); vscroll->set_value(0);
return; return;
} }
_validate_line_caches();
int line_count = 0; int line_count = 0;
int to_line = main->first_invalid_line.load(); int to_line = main->first_invalid_line.load();
for (int i = 0; i < to_line; i++) { for (int i = 0; i < to_line; i++) {