Commit 4f257238 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

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

parent e6a0fa9f
...@@ -5463,7 +5463,8 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, ...@@ -5463,7 +5463,8 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize,
case PAN_FAMILY_PICTORIAL: /* symbol fonts get treated as if they were text */ case PAN_FAMILY_PICTORIAL: /* symbol fonts get treated as if they were text */
/* which is clearly not what the panose spec says. */ /* which is clearly not what the panose spec says. */
default: default:
if(TM.tmPitchAndFamily == 0) /* fixed */ if(TM.tmPitchAndFamily == 0 || /* fixed */
pOS2->panose[PAN_PROPORTION_INDEX] == PAN_PROP_MONOSPACED)
TM.tmPitchAndFamily = FF_MODERN; TM.tmPitchAndFamily = FF_MODERN;
else else
{ {
......
...@@ -2387,7 +2387,8 @@ static void test_text_metrics(const LOGFONTA *lf) ...@@ -2387,7 +2387,8 @@ static void test_text_metrics(const LOGFONTA *lf)
case PAN_FAMILY_TEXT_DISPLAY: case PAN_FAMILY_TEXT_DISPLAY:
case PAN_FAMILY_PICTORIAL: case PAN_FAMILY_PICTORIAL:
default: 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); expect_ff(&tmA, &tt_os2, FF_MODERN, font_name);
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment