From 5c48ce6347211158a1491da89067a92b7c4ab2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= <jaakko.keranen@iki.fi>
Date: Sat, 12 Oct 2019 08:06:16 +0300
Subject: [PATCH] macOS|Client: Changed the UI font

More consistent and compatible with macOS 10.15.
---
 .../defaultstyle.pack/fonts.dei               | 39 ++-----------------
 doomsday/sdk/libgui/src/text/font.cpp         | 10 ++---
 2 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei b/doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei
index edf1e9de3c..913e082019 100644
--- a/doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei
+++ b/doomsday/apps/client/net.dengine.client.pack/defaultstyle.pack/fonts.dei
@@ -13,11 +13,7 @@ script {
     def loadFonts()
         import App
         fontDir = __file__.fileNamePath() / "fonts"
-        fontStyles = ['Regular', 'Bold', 'Italic', 'BoldItalic']
-        # Light fonts are a bit too thin for low-res displays.
-        if DisplayMode.PIXEL_RATIO > 1
-            fontStyles += ['Light', 'LightItalic']
-        end
+        fontStyles = ['Regular', 'Bold', 'Italic', 'BoldItalic', 'Light', 'LightItalic']
         for style in fontStyles
             App.loadFont(fontDir / ("SourceSansPro-%s.ttf" % style))
         end
@@ -46,29 +42,10 @@ group {
     condition: Version.OS == 'macx' or Version.OS == 'ios'
 
     script {
+        loadFonts()
+
         # Define mappings for native font styles and weights.
         import App
-        if Version.OS == 'macx'
-            prefix = '.SFNS'
-        else
-            prefix = '.SFUI'
-        end
-        App.addFontMapping("SF UI Text", {
-            ['regular', 25]: prefix + 'Text-Light',
-            ['regular', 50]: prefix + 'Text-Regular',
-            ['regular', 75]: prefix + 'Text-Bold',
-            ['italic',  25]: prefix + 'Text-LightItalic',
-            ['italic',  50]: prefix + 'Text-Italic',
-            ['italic',  75]: prefix + 'Text-BoldItalic'
-        })
-        App.addFontMapping("SF UI Display", {
-            ['regular', 25]: prefix + 'Display-Light',
-            ['regular', 50]: prefix + 'Display-Regular',
-            ['regular', 75]: prefix + 'Display-Bold',
-            ['italic',  25]: prefix + 'Text-LightItalic',    # Only non-italic available.
-            ['italic',  50]: prefix + 'Text-Italic',
-            ['italic',  75]: prefix + 'Text-BoldItalic'
-        })
         App.addFontMapping("Menlo", {
             ['regular', 25]: 'Menlo-Regular',
             ['regular', 50]: 'Menlo-Regular',
@@ -80,7 +57,7 @@ group {
     }
 
     font default {
-        family: SF UI Text
+        family: Source Sans Pro
         size $: gui.scale('16pt', DisplayMode.PIXEL_RATIO)
         weight: normal
         style: normal
@@ -117,14 +94,6 @@ font heading inherits title {
     size $: gui.scale(default.size, 1.2)
 }
 
-script {
-    if Version.OS == 'macx' or Version.OS == 'ios'
-        # Use the larger variant.
-        title.family   = "SF UI Display"
-        heading.family = "SF UI Display"
-    end
-}
-
 font small inherits default {
     size $: gui.scale(self.size, 0.75)
 }
diff --git a/doomsday/sdk/libgui/src/text/font.cpp b/doomsday/sdk/libgui/src/text/font.cpp
index 2841f08b35..175c3ce520 100644
--- a/doomsday/sdk/libgui/src/text/font.cpp
+++ b/doomsday/sdk/libgui/src/text/font.cpp
@@ -25,13 +25,13 @@
 #include <QPainter>
 #include <QThreadStorage>
 
-#if (defined(MACOSX) && defined(MACOS_10_7)) || defined (DENG_IOS)
-#  include "../src/text/coretextnativefont_macx.h"
-namespace de { typedef CoreTextNativeFont PlatformFont; }
-#else
+//#if (defined(MACOSX) && defined(MACOS_10_7)) || defined (DENG_IOS)
+//#  include "../src/text/coretextnativefont_macx.h"
+//namespace de { typedef CoreTextNativeFont PlatformFont; }
+//#else
 #  include "../src/text/qtnativefont.h"
 namespace de { typedef QtNativeFont PlatformFont; }
-#endif
+//#endif
 
 namespace de {