github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Draw: IsSerif support with fontconfig

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12213 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-08-31 14:03:04 +00:00
parent d32ddb896e
commit 6403162dca
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
uppsrc/Draw/FontFc.cpp
View file

@ -225,7 +225,11 @@ Vector<FaceInfo> GetAllFacesSys()
for(int i = 0; i < __countof(basic_fonts); i++) {
FaceInfo& fi = list.Add();
fi.name = basic_fonts[i];
fi.info = (i == 3) ? Font::SCALEABLE|Font::FIXEDPITCH : Font::SCALEABLE;
fi.info = Font::SCALEABLE;
if(i == Font::SERIF)
fi.info |= Font::SERIFSTYLE;
if(i == Font::MONOSPACE)
fi.info |= Font::FIXEDPITCH;
}
FcPattern *p = FcPatternCreate();
FcObjectSet *os = FcObjectSetBuild(FC_FAMILY, FC_SPACING, FC_SCALABLE, (void *)0);
@ -245,6 +249,11 @@ Vector<FaceInfo> GetAllFacesSys()
FcBool bv;
if(FcPatternGetBool(pt, FC_SCALABLE, 0, &bv) == 0 && bv)
fi.info |= Font::SCALEABLE;
String h = ToLower(fi.name);
if(h.Find("serif") >= 0 && h.Find("sans") < 0)
fi.info |= Font::SERIFSTYLE;
if(h.Find("script") >= 0)
fi.info |= Font::SCRIPTSTYLE;
}
}
FcFontSetDestroy(fs);