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: Win32 support for Font::IsScript, IsSerif

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@12208 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-08-31 12:06:42 +00:00
parent cc6ccbcc8b
commit 12bb53705e
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Draw/FontFc.cpp
View file

@ -202,7 +202,7 @@ GlyphInfo GetGlyphInfoSys(Font font, int chr)
FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT) == 0) {
FT_Glyph_Metrics& m = face->glyph->metrics;
int left = FLOOR(m.horiBearingX);
int width = TRUNC(CEIL(m.horiBearingX + m.width) - left);
int width = TRUNC(CEIL(m.horiBearingX + m.width) - left);
gi.width = TRUNC(ROUND(face->glyph->advance.x));
gi.lspc = TRUNC(left);
gi.rspc = gi.width - width - gi.lspc;

4
uppsrc/Draw/FontWin32.cpp
View file

@ -173,6 +173,10 @@ static int CALLBACK Win32_AddFace(const LOGFONT *logfont, const TEXTMETRIC *, dw
f.info = Font::SCALEABLE;
if((logfont->lfPitchAndFamily & 3) == FIXED_PITCH)
f.info |= Font::FIXEDPITCH;
if(logfont->lfPitchAndFamily & FF_ROMAN)
f.info |= Font::SERIFSTYLE;
if(logfont->lfPitchAndFamily & FF_SCRIPT)
f.info |= Font::SCRIPTSTYLE;
if(!(type & TRUETYPE_FONTTYPE))
f.info &= ~Font::SCALEABLE;
if(logfont->lfCharSet == SYMBOL_CHARSET || logfont->lfCharSet == OEM_CHARSET)

8
uppsrc/Draw/src.tpp/Font_en-us.tpp
View file

@ -337,6 +337,14 @@ there is a space inside the cell not used for glyph.&]
[s2;%% True if font is mono`-spaced.&]
[s3; &]
[s4; &]
[s5;:Upp`:`:Font`:`:IsSerif`(`)const: [@(0.0.255) bool]_[* IsSerif]()_[@(0.0.255) const]&]
[s2;%% True if font has serif style.&]
[s3; &]
[s4; &]
[s5;:Upp`:`:Font`:`:IsScript`(`)const: [@(0.0.255) bool]_[* IsScript]()_[@(0.0.255) const]&]
[s2;%% True if font has script style.&]
[s3; &]
[s4; &]
[s5;:Font`:`:IsScaleable`(`)const: [@(0.0.255) bool]_[* IsScaleable]()_[@(0.0.255) const]&]
[s2;%% True if font is freely scaleable.&]
[s3; &]