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

Added image UI element.

Browse Source
This commit is contained in:
Dominic Masters
2021-09-02 10:10:00 -07:00
parent 5c4fc01b43
commit c2aea93766
17 changed files with 215 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/display/font.c
View File

@ -45,7 +45,7 @@ void fontDispose(font_t *font) {
}
float fontGetScale(float fontSize) {
return fontSize / FONT_SIZE_DEFAULT;
return fontSize / FONT_SIZE_DEFAULT * FONT_GLOBAL_SCALE;
}
void fontTextBuffer(font_t *font, primitive_t *primitive, fonttextinfo_t *info){
@ -117,7 +117,7 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
info->lines[info->lineCount].start = info->realLength;
info->lines[info->lineCount].length = 0;
y += FONT_LINE_HEIGHT * scale;
y += FONT_LINE_HEIGHT;
x = 0;
}
wordX = x;
@ -132,7 +132,7 @@ void fontTextClamp(font_t *font, fonttextinfo_t *info, char *text,
info->lines[info->lineCount].length = 0;
wordStart = info->realLength;
y += FONT_LINE_HEIGHT * scale;
y += FONT_LINE_HEIGHT;
x = 0;
continue;
}