|
@@ -310,11 +310,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
|
310
|
310
|
if (utf8strlen) {
|
311
|
311
|
drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL);
|
312
|
312
|
/* shorten text if necessary */
|
313
|
|
- if (ew > w)
|
314
|
|
- for (ew = 0, len = 0; ew < w - lpad * 2 && len < MIN(utf8strlen, sizeof(buf) - 1); len++)
|
315
|
|
- drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
|
316
|
|
- else
|
317
|
|
- len = MIN(utf8strlen, sizeof(buf) - 1);
|
|
313
|
+ for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--)
|
|
314
|
+ drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
|
318
|
315
|
|
319
|
316
|
if (len) {
|
320
|
317
|
memcpy(buf, utf8str, len);
|