godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

[TextServer] Fix duplicated losing span info, and RID leak.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-12-11 21:50:22 +02:00
parent 14e840dd75
commit 8fa484f331
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/text_server_adv/text_server_adv.cpp
View File

@@ -4495,9 +4495,10 @@ RID TextServerAdvanced::_shaped_text_duplicate(const RID &p_shaped) {
MutexLock lock(sd->mutex); MutexLock lock(sd->mutex);
ShapedTextDataAdvanced *new_sd = memnew(ShapedTextDataAdvanced); ShapedTextDataAdvanced *new_sd = memnew(ShapedTextDataAdvanced);
new_sd->parent = p_shaped;
new_sd->start = sd->start; new_sd->start = sd->start;
new_sd->end = sd->end; new_sd->end = sd->end;
new_sd->first_span = sd->first_span;
new_sd->last_span = sd->last_span;
new_sd->text = sd->text; new_sd->text = sd->text;
new_sd->hb_buffer = hb_buffer_create(); new_sd->hb_buffer = hb_buffer_create();
new_sd->utf16 = new_sd->text.utf16(); new_sd->utf16 = new_sd->text.utf16();
@@ -4517,7 +4518,12 @@ RID TextServerAdvanced::_shaped_text_duplicate(const RID &p_shaped) {
for (int i = 0; i < TextServer::SPACING_MAX; i++) { for (int i = 0; i < TextServer::SPACING_MAX; i++) {
new_sd->extra_spacing[i] = sd->extra_spacing[i]; new_sd->extra_spacing[i] = sd->extra_spacing[i];
} }
full_copy(new_sd); for (const KeyValue<Variant, ShapedTextDataAdvanced::EmbeddedObject> &E : sd->objects) {
new_sd->objects[E.key] = E.value;
}
for (int i = 0; i < sd->spans.size(); i++) {
new_sd->spans.push_back(sd->spans[i]);
}
new_sd->valid.clear(); new_sd->valid.clear();
return shaped_owner.make_rid(new_sd); return shaped_owner.make_rid(new_sd);

9
modules/text_server_fb/text_server_fb.cpp
View File

@@ -3336,6 +3336,8 @@ RID TextServerFallback::_shaped_text_duplicate(const RID &p_shaped) {
new_sd->parent = p_shaped; new_sd->parent = p_shaped;
new_sd->start = sd->start; new_sd->start = sd->start;
new_sd->end = sd->end; new_sd->end = sd->end;
new_sd->first_span = sd->first_span;
new_sd->last_span = sd->last_span;
new_sd->text = sd->text; new_sd->text = sd->text;
new_sd->orientation = sd->orientation; new_sd->orientation = sd->orientation;
new_sd->direction = sd->direction; new_sd->direction = sd->direction;
@@ -3351,7 +3353,12 @@ RID TextServerFallback::_shaped_text_duplicate(const RID &p_shaped) {
for (int i = 0; i < TextServer::SPACING_MAX; i++) { for (int i = 0; i < TextServer::SPACING_MAX; i++) {
new_sd->extra_spacing[i] = sd->extra_spacing[i]; new_sd->extra_spacing[i] = sd->extra_spacing[i];
} }
full_copy(new_sd); for (const KeyValue<Variant, ShapedTextDataFallback::EmbeddedObject> &E : sd->objects) {
new_sd->objects[E.key] = E.value;
}
for (int i = 0; i < sd->spans.size(); i++) {
new_sd->spans.push_back(sd->spans[i]);
}
new_sd->valid.clear(); new_sd->valid.clear();
return shaped_owner.make_rid(new_sd); return shaped_owner.make_rid(new_sd);

1
scene/resources/text_line.cpp
View File

@@ -155,6 +155,7 @@ Ref<TextLine> TextLine::duplicate() const {
Ref<TextLine> copy; Ref<TextLine> copy;
copy.instantiate(); copy.instantiate();
if (rid.is_valid()) { if (rid.is_valid()) {
TS->free_rid(copy->rid);
copy->rid = TS->shaped_text_duplicate(rid); copy->rid = TS->shaped_text_duplicate(rid);
} }
copy->dirty = true; copy->dirty = true;

2
scene/resources/text_paragraph.cpp
View File

@@ -328,11 +328,13 @@ Ref<TextParagraph> TextParagraph::duplicate() const {
Ref<TextParagraph> copy; Ref<TextParagraph> copy;
copy.instantiate(); copy.instantiate();
if (dropcap_rid.is_valid()) { if (dropcap_rid.is_valid()) {
TS->free_rid(copy->dropcap_rid);
copy->dropcap_rid = TS->shaped_text_duplicate(dropcap_rid); copy->dropcap_rid = TS->shaped_text_duplicate(dropcap_rid);
} }
copy->dropcap_lines = dropcap_lines; copy->dropcap_lines = dropcap_lines;
copy->dropcap_margins = dropcap_margins; copy->dropcap_margins = dropcap_margins;
if (rid.is_valid()) { if (rid.is_valid()) {
TS->free_rid(copy->rid);
copy->rid = TS->shaped_text_duplicate(rid); copy->rid = TS->shaped_text_duplicate(rid);
} }
copy->lines_dirty = true; copy->lines_dirty = true;