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

restored width/height calc

Browse Source
This commit is contained in:
Dominic Masters
2021-05-25 20:17:40 -07:00
parent 79b7aa06ba
commit 5ad7ee233e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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