From b81ab5a32b46b4957ddf17e03f6dd85fc21f2b09 Mon Sep 17 00:00:00 2001
From: PatTheMav <PatTheMav@users.noreply.github.com>
Date: Fri, 5 Aug 2022 17:30:11 +0200
Subject: [PATCH] UI: Fix small font size on macOS and fallback font

Qt uses a default font size of 13pt for QWidgets on macOS. By setting
the default font size to 10pt, text becomes too small for comfortable
use on macOS.

This PR patches the font files copied into the macOS bundle to use a
larger font-size of 12pt. It also sets the fallback font to the more
modern SF Display-based `.AppleSystemUIFont` used by default in macOS
if Open Sans is not found.
---
 UI/data/themes/Acri.qss              |  2 +-
 UI/data/themes/Grey.qss              |  2 +-
 UI/data/themes/Light.qss             |  2 +-
 UI/data/themes/Rachni.qss            |  2 +-
 UI/data/themes/Yami.qss              |  2 +-
 cmake/Modules/ObsHelpers_macOS.cmake | 12 +++++++++++-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/UI/data/themes/Acri.qss b/UI/data/themes/Acri.qss
index dca12621b..489459528 100644
--- a/UI/data/themes/Acri.qss
+++ b/UI/data/themes/Acri.qss
@@ -82,7 +82,7 @@ QWidget {
     selection-background-color: rgb(22,31,65);
     selection-color: palette(text);
     font-size: 10pt;
-    font-family: 'Open Sans', Helvetica, Arial, 'MS Shell Dlg', sans-serif
+    font-family: 'Open Sans', '.AppleSystemUIFont', Helvetica, Arial, 'MS Shell Dlg', sans-serif;
 }
 
 QWidget:disabled {
diff --git a/UI/data/themes/Grey.qss b/UI/data/themes/Grey.qss
index 3fce451dc..ef19f6424 100644
--- a/UI/data/themes/Grey.qss
+++ b/UI/data/themes/Grey.qss
@@ -82,7 +82,7 @@ QWidget {
     selection-background-color: rgb(40,76,184);
     selection-color: palette(text);
     font-size: 10pt;
-    font-family: 'Open Sans', Helvetica, Arial, 'MS Shell Dlg', sans-serif
+    font-family: 'Open Sans', '.AppleSystemUIFont', Helvetica, Arial, 'MS Shell Dlg', sans-serif;
 }
 
 QWidget:disabled {
diff --git a/UI/data/themes/Light.qss b/UI/data/themes/Light.qss
index 701e353a4..875f61357 100644
--- a/UI/data/themes/Light.qss
+++ b/UI/data/themes/Light.qss
@@ -82,7 +82,7 @@ QWidget {
     selection-background-color: rgb(140,181,255);
     selection-color: palette(text);
     font-size: 10pt;
-    font-family: 'Open Sans', Helvetica, Arial, 'MS Shell Dlg', sans-serif
+    font-family: 'Open Sans', '.AppleSystemUIFont', Helvetica, Arial, 'MS Shell Dlg', sans-serif;
 }
 
 QWidget:disabled {
diff --git a/UI/data/themes/Rachni.qss b/UI/data/themes/Rachni.qss
index 1cf63748b..df52ce635 100644
--- a/UI/data/themes/Rachni.qss
+++ b/UI/data/themes/Rachni.qss
@@ -84,7 +84,7 @@ QWidget {
     selection-background-color: rgb(0,188,212);
     selection-color: palette(text);
     font-size: 10pt;
-    font-family: 'Open Sans', Helvetica, Arial, 'MS Shell Dlg', sans-serif
+    font-family: 'Open Sans', '.AppleSystemUIFont', Helvetica, Arial, 'MS Shell Dlg', sans-serif;
 }
 
 QWidget:disabled {
diff --git a/UI/data/themes/Yami.qss b/UI/data/themes/Yami.qss
index 49a063928..9b022e5a1 100644
--- a/UI/data/themes/Yami.qss
+++ b/UI/data/themes/Yami.qss
@@ -82,7 +82,7 @@ QWidget {
     selection-background-color: rgb(40,76,184);
     selection-color: palette(text);
     font-size: 10pt;
-    font-family: 'Open Sans', Helvetica, Arial, 'MS Shell Dlg', sans-serif
+    font-family: 'Open Sans', '.AppleSystemUIFont', Helvetica, Arial, 'MS Shell Dlg', sans-serif;
 }
 
 QWidget:disabled {
diff --git a/cmake/Modules/ObsHelpers_macOS.cmake b/cmake/Modules/ObsHelpers_macOS.cmake
index 4311c39f4..4cb056b55 100644
--- a/cmake/Modules/ObsHelpers_macOS.cmake
+++ b/cmake/Modules/ObsHelpers_macOS.cmake
@@ -355,7 +355,6 @@ function(setup_obs_bundle target)
     COMPONENT obs_resources)
 
   if(ENABLE_SPARKLE_UPDATER)
-
     add_custom_command(
       TARGET ${target}
       POST_BUILD
@@ -388,6 +387,17 @@ function(setup_obs_bundle target)
       COMPONENT obs_frameworks)
   endif()
 
+  add_custom_command(
+    TARGET ${target}
+    POST_BUILD
+    COMMAND
+      /usr/bin/sed -i '' 's/font-size: 10pt\;/font-size: 12pt\;/'
+      "$<TARGET_BUNDLE_CONTENT_DIR:${target}>/Resources/themes/Acri.qss"
+      "$<TARGET_BUNDLE_CONTENT_DIR:${target}>/Resources/themes/Grey.qss"
+      "$<TARGET_BUNDLE_CONTENT_DIR:${target}>/Resources/themes/Light.qss"
+      "$<TARGET_BUNDLE_CONTENT_DIR:${target}>/Resources/themes/Rachni.qss"
+      "$<TARGET_BUNDLE_CONTENT_DIR:${target}>/Resources/themes/Yami.qss")
+
   install(SCRIPT "${CMAKE_SOURCE_DIR}/cmake/bundle/macOS/bundleutils.cmake"
           COMPONENT obs_resources)
 endfunction()