uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Improve font name searching.

Browse source
This commit is contained in:
inmarket 2013-08-17 23:33:31 +10:00
parent a2b27a6f5c
commit 323f53e1dc
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gdisp/fonts.c
View file

@ -51,13 +51,17 @@ static bool_t matchfont(const char *pattern, const char *name) {
font_t gdispOpenFont(const char *name) { font_t gdispOpenFont(const char *name) {
const struct mf_font_list_s *fp; const struct mf_font_list_s *fp;
fp = mf_get_font_list();
while (fp) // Try the long names first
{ for(fp = mf_get_font_list(); fp; fp = fp->next) {
if (matchfont(name, fp->font->full_name))
return fp->font;
}
// Try the short names if no long names match
for(fp = mf_get_font_list(); fp; fp = fp->next) {
if (matchfont(name, fp->font->short_name)) if (matchfont(name, fp->font->short_name))
return fp->font; return fp->font;
fp = fp->next;
} }
/* Return default font.. better than nothing. */ /* Return default font.. better than nothing. */