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

Merge pull request #110191 from bruvzg/tx_upd_or

Browse Source 
[TextEdit] Fix text edit font update order.
This commit is contained in:
Clay John
2025-09-02 07:24:02 -07:00
committed by GitHub
parent 6339f31a02 7368d148c1
commit fcd1cf8d57
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scene/gui/text_edit.cpp
View File

@ -319,8 +319,19 @@ void TextEdit::Text::invalidate_cache(int p_line, bool p_text_changed) {
} }
String remaining_string = text_with_ime.substr(from); String remaining_string = text_with_ime.substr(from);
text_line.data_buf->add_string(remaining_string, font, font_size, language); text_line.data_buf->add_string(remaining_string, font, font_size, language);
}
if (!bidi_override_with_ime.is_empty()) {
TS->shaped_text_set_bidi_override(text_line.data_buf->get_rid(), bidi_override_with_ime);
}
if (!p_text_changed) {
// Update fonts.
RID r = text_line.data_buf->get_rid();
int spans = TS->shaped_get_span_count(r);
for (int i = 0; i < spans; i++) {
TS->shaped_set_span_update_font(r, i, font->get_rids(), font_size, font->get_opentype_features());
}
} else {
// Update inline object sizes. // Update inline object sizes.
for (int i = 0; i < text_line.data_buf->get_line_count(); i++) { for (int i = 0; i < text_line.data_buf->get_line_count(); i++) {
for (Variant key : text_line.data_buf->get_line_objects(i)) { for (Variant key : text_line.data_buf->get_line_objects(i)) {
@ -333,17 +344,6 @@ void TextEdit::Text::invalidate_cache(int p_line, bool p_text_changed) {
} }
} }
} }
if (!bidi_override_with_ime.is_empty()) {
TS->shaped_text_set_bidi_override(text_line.data_buf->get_rid(), bidi_override_with_ime);
}
if (!p_text_changed) {
RID r = text_line.data_buf->get_rid();
int spans = TS->shaped_get_span_count(r);
for (int i = 0; i < spans; i++) {
TS->shaped_set_span_update_font(r, i, font->get_rids(), font_size, font->get_opentype_features());
}
}
// Apply tab align. // Apply tab align.
if (tab_size > 0) { if (tab_size > 0) {