YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected final font issues.

Browse Source
This commit is contained in:
Dominic Masters
2021-05-26 06:17:13 -07:00
parent 5ad7ee233e
commit b81c4ca604
7 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/display/gui/font.c
View File

@ -110,9 +110,6 @@ fonttextinfo_t * fontTextClamp(font_t *font, char *text, float maxWidth) {
if(c == FONT_SPACE) {
x += FONT_SPACE_SIZE;
info->width = mathMax(info->width, quad->x1);
info->height = mathMax(info->height, quad->y1);
// Did this space cause a newline?
if(x > maxWidth) {
info->lines++;
@ -167,8 +164,12 @@ fonttextinfo_t * fontTextClamp(font_t *font, char *text, float maxWidth) {
info->realLength++;
}
info->width = mathMax(info->width, quad->x1);
info->height = mathMax(info->height, quad->y1);
for(j = 0; j < info->realLength; j++) {
quad = info->quads + j;
info->width = mathMax(info->width, quad->x1);
info->height = mathMax(info->height, quad->y1);
}
return info;
}