archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: use BLF_width_to_strlen for efficient text clipping

Browse Source
This commit is contained in:
Campbell Barton
2013-12-16 21:59:47 +11:00
parent ce3f42e16a
commit 09b4954d2d
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/editors/interface/interface_widgets.c
View File

@@ -969,10 +969,11 @@ static void ui_text_clip_left(uiFontStyle *fstyle, uiBut *but, const rcti *rect)
but->ofs = 0; but->ofs = 0;
but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr, sizeof(but->drawstr)); but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr, sizeof(but->drawstr));
while (but->strwidth > okwidth) { if (but->strwidth > okwidth) {
ui_text_clip_give_next_off(but); float strwidth;
but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, sizeof(but->drawstr) - but->ofs); but->ofs = BLF_width_to_rstrlen(fstyle->uifont_id, but->drawstr,
if (but->strwidth < 10) break; sizeof(but->drawstr), okwidth, &strwidth);
but->strwidth = strwidth;
} }
if (fstyle->kerning == 1) { if (fstyle->kerning == 1) {
@@ -1102,17 +1103,12 @@ static void ui_text_clip_right_label(uiFontStyle *fstyle, uiBut *but, const rcti
/* Now just remove trailing chars */ /* Now just remove trailing chars */
/* once the label's gone, chop off the least significant digits */ /* once the label's gone, chop off the least significant digits */
while (but->strwidth > okwidth) { if (but->strwidth > okwidth) {
int bytes = BLI_str_utf8_size(BLI_str_find_prev_char_utf8(but->drawstr, but->drawstr + drawstr_len)); float strwidth;
if (bytes < 0) drawstr_len = BLF_width_to_strlen(fstyle->uifont_id, but->drawstr + but->ofs,
bytes = 1; drawstr_len - but->ofs, okwidth, &strwidth) + but->ofs;
but->strwidth = strwidth;
drawstr_len -= bytes;
but->drawstr[drawstr_len] = 0; but->drawstr[drawstr_len] = 0;
// BLI_assert(strlen(but->drawstr) == drawstr_len);
but->strwidth = BLF_width(fstyle->uifont_id, but->drawstr + but->ofs, sizeof(but->drawstr) - but->ofs);
if (but->strwidth < 10) break;
} }
if (fstyle->kerning == 1) if (fstyle->kerning == 1)