UI strings: Fix asserts in 'middle-splitting' fitting string code.

The problem is that string width computing is performed in integers
(pixels), which can generate a rather annoying error (a few pixels)...
Simply work around that for now, by trimming an extra middle char when
needed.
This commit is contained in:
Bastien Montagne 2018-10-03 16:22:10 +02:00
parent fb60fb055d
commit 9c09998530
1 changed files with 10 additions and 0 deletions

View File

@ -1521,6 +1521,16 @@ float UI_text_clip_middle_ex(
memmove(str + l_end + sep_len, str + r_offset, r_len);
memcpy(str + l_end, sep, sep_len);
final_lpart_len = (size_t)(l_end + sep_len + r_len - 1); /* -1 to remove trailing '\0'! */
while (BLF_width(fstyle->uifont_id, str, max_len) > okwidth) {
/* This will happen because a lot of string width processing is done in integer pixels,
* which can introduce a rather high error in the end (about 2 pixels or so).
* Only one char removal shall ever be needed in real-life situation... */
r_len--;
final_lpart_len--;
char *c = str + l_end + sep_len;
memmove(c, c + 1, r_len);
}
}
}