ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Use a better heuristics for tmWeight. 

Marlett uses FW_MEDIUM (500) and current code allows only FW_REGULAR and
FW_BOLD. New heuristics detects if flags and usWeightClass in the font match.
This commit is contained in:
Dmitry Timoshkov 2009-07-31 22:21:51 +09:00 committed by Alexandre Julliard
parent 16aa1369f8
commit 69b29fa07e
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/gdi32/freetype.c
View File

@ -5585,7 +5585,19 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize,
TM.tmAveCharWidth = 1; TM.tmAveCharWidth = 1;
} }
TM.tmMaxCharWidth = (pFT_MulFix(ft_face->bbox.xMax - ft_face->bbox.xMin, x_scale) + 32) >> 6; TM.tmMaxCharWidth = (pFT_MulFix(ft_face->bbox.xMax - ft_face->bbox.xMin, x_scale) + 32) >> 6;
TM.tmWeight = (font->fake_bold || (ft_face->style_flags & FT_STYLE_FLAG_BOLD)) ? FW_BOLD : FW_REGULAR; TM.tmWeight = FW_REGULAR;
if (font->fake_bold)
TM.tmWeight = FW_BOLD;
else
{
if (ft_face->style_flags & FT_STYLE_FLAG_BOLD)
{
if (pOS2->usWeightClass > FW_MEDIUM)
TM.tmWeight = pOS2->usWeightClass;
}
else if (pOS2->usWeightClass <= FW_MEDIUM)
TM.tmWeight = pOS2->usWeightClass;
}
TM.tmOverhang = 0; TM.tmOverhang = 0;
TM.tmDigitizedAspectX = 300; TM.tmDigitizedAspectX = 300;
TM.tmDigitizedAspectY = 300; TM.tmDigitizedAspectY = 300;