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

gdi32: Set the font family as FF_MODERN if the panose marks it as monospaced.

This commit is contained in:
Huw Davies 2009-02-19 10:41:34 +00:00 committed by Alexandre Julliard
parent e6a0fa9f44
commit 4f25723853
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/gdi32/freetype.c
View File

@ -5463,7 +5463,8 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize,
case PAN_FAMILY_PICTORIAL: /* symbol fonts get treated as if they were text */
/* which is clearly not what the panose spec says. */
default:
if(TM.tmPitchAndFamily == 0) /* fixed */
if(TM.tmPitchAndFamily == 0 || /* fixed */
pOS2->panose[PAN_PROPORTION_INDEX] == PAN_PROP_MONOSPACED)
TM.tmPitchAndFamily = FF_MODERN;
else
{

3
dlls/gdi32/tests/font.c
View File

@ -2387,7 +2387,8 @@ static void test_text_metrics(const LOGFONTA *lf)
case PAN_FAMILY_TEXT_DISPLAY:
case PAN_FAMILY_PICTORIAL:
default:
if((tmA.tmPitchAndFamily & 1) == 0) /* fixed */
if((tmA.tmPitchAndFamily & 1) == 0 || /* fixed */
tt_os2.panose.bProportion == PAN_PROP_MONOSPACED)
{
expect_ff(&tmA, &tt_os2, FF_MODERN, font_name);
break;