summaryrefslogtreecommitdiff
path: root/pango/pangowin32-fontmap.c
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2022-07-15 18:36:56 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2022-09-26 11:04:25 +0800
commit43f3d8b3c22a02b83a3221bd7a0de52a88524c07 (patch)
treec15a98a617bf033e2e008268e23a72d948d99406 /pango/pangowin32-fontmap.c
parent5bc16f7896ba3eb5b37ffdb03f28c646aad5889e (diff)
downloadpango-43f3d8b3c22a02b83a3221bd7a0de52a88524c07.tar.gz
pangowin32: Check for MonoSpace fonts using DirectWrite
...if we have Windows 7 with the platform update (which is normally the case), otherwise we fallback to former GDI approach, since we need to use the IDWriteFont1 interface that is only available with updated Windows 7.
Diffstat (limited to 'pango/pangowin32-fontmap.c')
-rw-r--r--pango/pangowin32-fontmap.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 9a140702..3756c929 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -1736,8 +1736,12 @@ pango_win32_insert_font (PangoWin32FontMap *win32fontmap,
win32face->family = win32family =
pango_win32_get_font_family (win32fontmap,
pango_font_description_get_family (win32face->description));
- if ((lfp->lfPitchAndFamily & 0xF0) == FF_MODERN)
- win32family->is_monospace = TRUE;
+
+ if (!pango_win32_dwrite_font_is_monospace (dwrite_font, &win32family->is_monospace))
+ {
+ if ((lfp->lfPitchAndFamily & 0xF0) == FF_MODERN)
+ win32family->is_monospace = TRUE;
+ }
win32family->faces = g_slist_append (win32family->faces, win32face);