fix last emtpy

evilbinary · evilbinary · commit 05587a4311ea · 2019-10-11T13:12:45.000+08:00
diff --git a/lib/libgui/fontstash.c b/lib/libgui/fontstash.c
@@ -640,14 +640,14 @@ int sth_pos(struct sth_stash* stash, int idx, float size, float width, char* s,
     }
     glyph = get_glyph(stash, fnt, codepoint, isize);
     if (!glyph) continue;
-    if ((width + glyph->xoff - glyph->xadv ) <= sx) {
+    if ((width + glyph->xoff - glyph->xadv ) < sx) {
       return i;
     }
-    i++;
     if (!get_quad(stash, fnt, glyph, isize, &x, &y, &q)) continue;
     sx = x;
+    i++;
   }
-  return i;
+  return -1;
 }
 
 void sth_measure(struct sth_stash* stash, int idx, float size, float width,

Original file line number	Diff line number	Diff line change
`@@ -640,14 +640,14 @@ int sth_pos(struct sth_stash* stash, int idx, float size, float width, char* s,`
`640`	`640`	`}`
`641`	`641`	`glyph = get_glyph(stash, fnt, codepoint, isize);`
`642`	`642`	`if (!glyph) continue;`
`643`		`- if ((width + glyph->xoff - glyph->xadv ) <= sx) {`
	`643`	`+ if ((width + glyph->xoff - glyph->xadv ) < sx) {`
`644`	`644`	`return i;`
`645`	`645`	`}`
`646`		`- i++;`
`647`	`646`	`if (!get_quad(stash, fnt, glyph, isize, &x, &y, &q)) continue;`
`648`	`647`	`sx = x;`
	`648`	`+ i++;`
`649`	`649`	`}`
`650`		`- return i;`
	`650`	`+ return -1;`
`651`	`651`	`}`
`652`	`652`
`653`	`653`	`void sth_measure(struct sth_stash* stash, int idx, float size, float width,`