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

Fix: Ask FontConfig for the face index when opening fonts. (#10878) 

This allows selection of the correct face in truetype fonts containing
multiple faces.
pull/10922/head
PeterN 2023-05-26 19:56:13 +01:00 committed by Loïc Guilloux
parent a75a90b3af
commit 680eb6b516
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/os/unix/font_unix.cpp
View File

@ -61,13 +61,15 @@ FT_Error GetFontByFaceName(const char *font_name, FT_Face *face)
FcChar8 *family; FcChar8 *family;
FcChar8 *style; FcChar8 *style;
FcChar8 *file; FcChar8 *file;
int32_t index;
FcFontSetAdd(fs, match); FcFontSetAdd(fs, match);
for (i = 0; err != FT_Err_Ok && i < fs->nfont; i++) { for (i = 0; err != FT_Err_Ok && i < fs->nfont; i++) {
/* Try the new filename */ /* Try the new filename */
if (FcPatternGetString(fs->fonts[i], FC_FILE, 0, &file) == FcResultMatch && if (FcPatternGetString(fs->fonts[i], FC_FILE, 0, &file) == FcResultMatch &&
FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch && FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch &&
FcPatternGetString(fs->fonts[i], FC_STYLE, 0, &style) == FcResultMatch) { FcPatternGetString(fs->fonts[i], FC_STYLE, 0, &style) == FcResultMatch &&
FcPatternGetInteger(fs->fonts[i], FC_INDEX, 0, &index) == FcResultMatch) {
/* The correct style? */ /* The correct style? */
if (font_style != nullptr && strcasecmp(font_style, (char *)style) != 0) continue; if (font_style != nullptr && strcasecmp(font_style, (char *)style) != 0) continue;
@ -76,7 +78,7 @@ FT_Error GetFontByFaceName(const char *font_name, FT_Face *face)
* wrongly a 'random' font, so check whether the family name is the * wrongly a 'random' font, so check whether the family name is the
* same as the supplied name */ * same as the supplied name */
if (strcasecmp(font_family, (char *)family) == 0) { if (strcasecmp(font_family, (char *)family) == 0) {
err = FT_New_Face(_library, (char *)file, 0, face); err = FT_New_Face(_library, (char *)file, index, face);
} }
} }
} }