diff --git a/doomsday/libs/gui/net.dengine.stdlib.gui.pack/fonts.dei b/doomsday/libs/gui/net.dengine.stdlib.gui.pack/fonts.dei index d7e642c578..ab5ccfa750 100644 --- a/doomsday/libs/gui/net.dengine.stdlib.gui.pack/fonts.dei +++ b/doomsday/libs/gui/net.dengine.stdlib.gui.pack/fonts.dei @@ -48,35 +48,38 @@ group { condition: Version.OS in ['macx', 'ios'] script { + loadFonts() + # Define mappings for native font styles and weights. - import App - App.addFontMapping("Apple UI", { - ['regular', 25]: '#system-light', - ['regular', 50]: '#system', - ['regular', 75]: '#system-bold', - ['italic', 25]: '#system-italic-light', - ['italic', 50]: '#system-italic', - ['italic', 75]: '#system-italic-bold' - }) - App.addFontMapping("Apple Mono", { - ['regular', 25]: 'Menlo-Regular', - ['regular', 50]: 'Menlo-Regular', - ['regular', 75]: 'Menlo-Bold', - ['italic', 25]: 'Menlo-Italic', - ['italic', 50]: 'Menlo-Italic', - ['italic', 75]: 'Menlo-BoldItalic' - }) + # (These work with the CoreText font renderer.) + # import App + # App.addFontMapping("Apple UI", { + # ['regular', 25]: '#system-light', + # ['regular', 50]: '#system', + # ['regular', 75]: '#system-bold', + # ['italic', 25]: '#system-italic-light', + # ['italic', 50]: '#system-italic', + # ['italic', 75]: '#system-italic-bold' + # }) + # App.addFontMapping("Apple Mono", { + # ['regular', 25]: 'Menlo-Regular', + # ['regular', 50]: 'Menlo-Regular', + # ['regular', 75]: 'Menlo-Bold', + # ['italic', 25]: 'Menlo-Italic', + # ['italic', 50]: 'Menlo-Italic', + # ['italic', 75]: 'Menlo-BoldItalic' + # }) } font default { - family: Apple UI + family: SourceSansPro size: 16pt weight: normal style: normal } font monospace inherits default { - family: Apple Mono + family: SourceCodePro size: 12pt } } diff --git a/doomsday/libs/gui/src/text/font.cpp b/doomsday/libs/gui/src/text/font.cpp index ac8e5fc5e2..982b62febb 100644 --- a/doomsday/libs/gui/src/text/font.cpp +++ b/doomsday/libs/gui/src/text/font.cpp @@ -22,13 +22,13 @@ #include #include -#if (defined(MACOSX) && defined(MACOS_10_7)) || defined(DE_IOS) -# include "coretextnativefont_macx.h" - namespace de { using PlatformFont = CoreTextNativeFont; } -#else +//#if (defined(MACOSX) && defined(MACOS_10_7)) || defined(DE_IOS) +//# include "coretextnativefont_macx.h" +// namespace de { using PlatformFont = CoreTextNativeFont; } +//#else # include "stbttnativefont.h" namespace de { using PlatformFont = StbTtNativeFont; } -#endif +//#endif namespace std { template<>