From b0f99ccd7393cfbc3808debf195e462229218b9b Mon Sep 17 00:00:00 2001 From: speedie Date: Mon, 3 Apr 2023 20:50:57 +0200 Subject: [PATCH] improve text shortening --- libs/sl/draw.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/sl/draw.c b/libs/sl/draw.c index 9535468..5283758 100644 --- a/libs/sl/draw.c +++ b/libs/sl/draw.c @@ -363,8 +363,9 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp if (len) { drw_font_getexts(drw->font, text, len, &ew, NULL, markup); /* shorten text if necessary */ - for (len = MIN(len, sizeof(buf) - 1); len && ew > w; len--) - drw_font_getexts(drw->font, text, len, &ew, NULL, markup); + for (len = MIN(len, sizeof(buf) - 1); len && ew > w; drw_font_getexts(drw->font, text, len, &ew, NULL, markup)) + len--; + if (len) { memcpy(buf, text, len); @@ -451,8 +452,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp if (utf8strlen) { drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL, True); /* shorten text if necessary */ - for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--) - drw_font_getexts(usedfont, utf8str, len, &ew, NULL, True); + for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; drw_font_getexts(usedfont, utf8str, len, &ew, NULL, True)) + len--; if (len) { memcpy(buf, utf8str, len);