Przeglądaj źródła

Merge pull request #53145 from bruvzg/fix_trim_width_reset

Fix trim overrun width not being reset.
Rémi Verschelde 4 lat temu
rodzic
commit
5503059f3b

+ 1 - 0
modules/text_server_adv/text_server_adv.cpp

@@ -3573,6 +3573,7 @@ void TextServerAdvanced::shaped_text_overrun_trim_to_width(RID p_shaped_line, re
 		shaped_text_shape(p_shaped_line);
 	}
 
+	sd->text_trimmed = false;
 	sd->overrun_trim_data.ellipsis_glyph_buf.clear();
 
 	bool add_ellipsis = (p_trim_flags & OVERRUN_ADD_ELLIPSIS) == OVERRUN_ADD_ELLIPSIS;

+ 1 - 0
modules/text_server_fb/text_server_fb.cpp

@@ -2683,6 +2683,7 @@ void TextServerFallback::shaped_text_overrun_trim_to_width(RID p_shaped_line, re
 		shaped_text_shape(p_shaped_line);
 	}
 
+	sd->text_trimmed = false;
 	sd->overrun_trim_data.ellipsis_glyph_buf.clear();
 
 	bool add_ellipsis = (p_trim_flags & OVERRUN_ADD_ELLIPSIS) == OVERRUN_ADD_ELLIPSIS;