Revert "Improve speed of drw_text when provided with large strings"
This reverts commit c585e8e498
.
It causes issues with truncation of characters when the text does not fit and
so on. The patch should be reworked and properly tested.
main
parent
cd2133a5f6
commit
d78ff08d99
7
drw.c
7
drw.c
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue