Skip to content

Commit fec9ffa

Browse files
committed
Merge pull request #111964 from bruvzg/zw_sp_1
[TextServer] Fix range for zero-width glyphs extra spacing.
2 parents beac359 + eaa643a commit fec9ffa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

modules/text_server_adv/text_server_adv.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6859,8 +6859,8 @@ void TextServerAdvanced::_shape_run(ShapedTextDataAdvanced *p_sd, int64_t p_star
68596859

68606860
unsigned int last_non_zero_w = glyph_count - 1;
68616861
if (last_run) {
6862-
for (unsigned int i = glyph_count - 1; i > 0; i--) {
6863-
last_non_zero_w = i;
6862+
for (int64_t i = glyph_count - 1; i >= 0; i--) {
6863+
last_non_zero_w = (unsigned int)i;
68646864
if (p_sd->orientation == ORIENTATION_HORIZONTAL) {
68656865
if (glyph_pos[i].x_advance != 0) {
68666866
break;

modules/text_server_fb/text_server_fb.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4822,7 +4822,7 @@ bool TextServerFallback::_shaped_text_shape(const RID &p_shaped) {
48224822
// Text span.
48234823
int last_non_zero_w = sd->end - 1;
48244824
if (i == sd->spans.size() - 1) {
4825-
for (int j = span.end - 1; j > span.start; j--) {
4825+
for (int j = span.end - 1; j >= span.start; j--) {
48264826
last_non_zero_w = j;
48274827
uint32_t idx = (int32_t)sd->text[j - sd->start];
48284828
if (!is_control(idx) && !(idx >= 0x200B && idx <= 0x200D)) {

0 commit comments

Comments
 (0)