diff options
author | Hiltjo Posthuma <hiltjo@codemadness.org> | 2021-08-20 23:09:48 +0200 |
---|---|---|
committer | Hiltjo Posthuma <hiltjo@codemadness.org> | 2021-08-20 23:09:48 +0200 |
commit | a786211d6cb794fba0ea406d86002c7618998afc (patch) | |
tree | 916ae3ca84f31fc7d07ca272033986acbd28c861 | |
parent | 716233534b35f74dba5a46ade8f1a6f8cc72fea4 (diff) |
Revert "Improve speed of drw_text when provided with large strings"
This reverts commit 716233534b35f74dba5a46ade8f1a6f8cc72fea4.
It causes issues with truncation of characters when the text does not fit and
so on. The patch should be reworked and properly tested.
-rw-r--r-- | drw.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -310,11 +310,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); /* shorten text if necessary */ - if (ew > w) - for (ew = 0, len = 0; ew < w - lpad * 2 && len < MIN(utf8strlen, sizeof(buf) - 1); len++) - drw_font_getexts(usedfont, utf8str, len, &ew, NULL); - else - len = MIN(utf8strlen, sizeof(buf) - 1); + for (len = MIN(utf8strlen, sizeof(buf) - 1); len && ew > w; len--) + drw_font_getexts(usedfont, utf8str, len, &ew, NULL); if (len) { memcpy(buf, utf8str, len); |