diff options
Diffstat (limited to 'pango2/pangodwrite-fontmap.cpp')
| -rw-r--r-- | pango2/pangodwrite-fontmap.cpp | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/pango2/pangodwrite-fontmap.cpp b/pango2/pangodwrite-fontmap.cpp index 532c3a38..7f4ead15 100644 --- a/pango2/pangodwrite-fontmap.cpp +++ b/pango2/pangodwrite-fontmap.cpp @@ -29,13 +29,12 @@ #include <hb-directwrite.h> #include "pangodwrite-fontmap.h" -#include "pango-hbfamily-private.h" #include "pango-fontmap-private.h" #include "pango-hbface-private.h" #include "pango-hbfont-private.h" #include "pango-context.h" -#include "pango-impl-utils.h" #include "pango-trace-private.h" +#include "pangowin32-utils-private.h" /** @@ -333,37 +332,7 @@ pango2_direct_write_font_map_populate (Pango2FontMap *map) collection->Release (); collection = NULL; - /* Add generic aliases */ - struct { - const char *alias_name; - const char *family_name; - } aliases[] = { - { "Monospace", "Consolas" }, - { "Sans-serif", "Arial" }, - { "Sans", "Arial" }, - { "Serif", "Times New Roman" }, - { "System-ui", "Segoe UI" }, - { "Emoji", "Segoe UI Emoji" } - }; - -#if 0 - if (IsWindows11OrLater ()) - aliases[0].family_name = "Cascadia Mono"; -#endif - - for (gsize i = 0; i < G_N_ELEMENTS (aliases); i++) - { - Pango2FontFamily *family = pango2_font_map_get_family (map, aliases[i].family_name); - - if (family) - { - Pango2GenericFamily *alias_family; - - alias_family = pango2_generic_family_new (aliases[i].alias_name); - pango2_generic_family_add_family (alias_family, family); - pango2_font_map_add_family (map, PANGO2_FONT_FAMILY (alias_family)); - } - } + pango2_win32_font_map_add_aliases_and_fallbacks (map); } /* }}} */ |