Browse Source

Revert "Improve speed of drw_text when provided with large strings"

This reverts commit 716233534b.

It causes issues with truncation of characters when the text does not fit and
so on.  The patch should be reworked and properly tested.
Hiltjo Posthuma 10 months ago
parent
commit
a786211d6c
1 changed files with 2 additions and 5 deletions
  1. 2
    5
      drw.c

+ 2
- 5
drw.c View File

@@ -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);

Loading…
Cancel
Save