mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r23277) -Codechange: fallback font support for fontcache

release/1.2
rubidium 2011-11-20 12:02:06 +00:00
parent 462b875b4a
commit 33f1636847
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fontcache.cpp
View File

@ -709,7 +709,7 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
/* First create a pattern to match the wanted language. */ /* First create a pattern to match the wanted language. */
FcPattern *pat = FcNameParse((FcChar8*)lang); FcPattern *pat = FcNameParse((FcChar8*)lang);
/* We only want to know the filename. */ /* We only want to know the filename. */
FcObjectSet *os = FcObjectSetBuild(FC_FILE, NULL); FcObjectSet *os = FcObjectSetBuild(FC_FILE, FC_SPACING, NULL);
/* Get the list of filenames matching the wanted language. */ /* Get the list of filenames matching the wanted language. */
FcFontSet *fs = FcFontList(NULL, pat, os); FcFontSet *fs = FcFontList(NULL, pat, os);
@ -727,6 +727,10 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
continue; continue;
} }
int value = 0;
FcPatternGetInteger(font, FC_SPACING, 0, &value);
if (callback->Monospace() != (value == FC_MONO) && value != FC_DUAL) continue;
callback->SetFontNames(settings, (const char*)file); callback->SetFontNames(settings, (const char*)file);
bool missing = callback->FindMissingGlyphs(NULL); bool missing = callback->FindMissingGlyphs(NULL);