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

Merge pull request #113908 from bruvzg/ts_dup_fix

Browse Source 
[TextServer] Fix `duplicated` losing span info, and RID leak.
This commit is contained in:
Thaddeus Crews
2025-12-15 17:40:53 -06:00
parent 1aa9035ac2 8fa484f331
commit 76972d691d
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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->start = sd->start;
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->orientation = sd->orientation;
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++) {
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();
return shaped_owner.make_rid(new_sd);