john/cell
1
0
Fork 0
Code Issues 31 Pull Requests Packages Projects Releases 2 Wiki Activity

fix word wrap meausrement

Browse Source
This commit is contained in:
John Alanbrook
2025-11-06 13:15:38 -06:00
parent 768ad399de
commit 721ac3bb93
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/font.c
View File

@@ -173,34 +173,40 @@ HMM_Vec2 measure_text(const char *text, font *f, float letterSpacing, float wrap
float wordWidth = 0;
float spaceWidth = f->Characters[' '].advance + letterSpacing;
for (const char *c = text; *c != '\0'; c++) {
for (const char *c = text; *c != '\0'; ) {
if (*c == '\n') {
maxWidth = fmaxf(maxWidth, lineWidth);
lineWidth = 0;
height += lineHeight + f->linegap;
wordStart = c + 1;
wordWidth = 0;
c++;
continue;
}
float charWidth = f->Characters[(unsigned char)*c].advance + letterSpacing;
if (wrap > 0 && lineWidth + charWidth > wrap) {
if (breakAtWord && *c != ' ' && wordWidth > 0) {
if (breakAtWord && *c != ' ' && wordWidth > 0 && wordWidth <= wrap) {
// Backtrack to word start only if the word would fit on a new line
lineWidth -= wordWidth;
c = wordStart - 1;
}
maxWidth = fmaxf(maxWidth, lineWidth);
lineWidth = 0;
height += lineHeight + f->linegap;
wordStart = c + 1;
wordWidth = 0;
if (!breakAtWord) {
lineWidth += charWidth;
continue;
c = wordStart;
} else {
// Character-based wrapping or word too long to fit
maxWidth = fmaxf(maxWidth, lineWidth);
lineWidth = 0;
height += lineHeight + f->linegap;
wordStart = c;
wordWidth = 0;
if (!breakAtWord || *c == ' ') {
c++;
continue;
}
// For word-based wrapping with long words, don't advance c here - let it be processed in this line
}
} else {
c++;
}
lineWidth += charWidth;