diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-27 23:46:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 23:46:19 +0200 |
| commit | 5503059f3b07c88aaa7efefd0122d51353ac867b (patch) | |
| tree | 23dbdac244e953d9d35eb6a3a2c65dfbde4f18ec | |
| parent | 30cf49e8d0325759b36af698f0c08d95629d1e09 (diff) | |
| parent | 11a49c2f29d7e4ee5937eebce5ea6b16d50c7eee (diff) | |
Merge pull request #53145 from bruvzg/fix_trim_width_reset
Fix trim overrun width not being reset.
| -rw-r--r-- | modules/text_server_adv/text_server_adv.cpp | 1 | ||||
| -rw-r--r-- | modules/text_server_fb/text_server_fb.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp index ef1411fb3b..c93f353cea 100644 --- a/modules/text_server_adv/text_server_adv.cpp +++ b/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; diff --git a/modules/text_server_fb/text_server_fb.cpp b/modules/text_server_fb/text_server_fb.cpp index 8a1bd93c65..1323aa80ce 100644 --- a/modules/text_server_fb/text_server_fb.cpp +++ b/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; |