From d514557091fb1d5f3bcf7309af075324e279df41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Thu, 7 Sep 2023 17:18:13 +0200
Subject: [PATCH] CoreText: Resolve color scheme (dark mode) via the platform
 theme

We might be drawing glyphs outside the main thread, which triggers
the main thread checker for our access to NSApplication from
qt_mac_applicationIsInDarkMode().

Change the CoreText font engine to pull out this information from
the theme instead, and teach the theme to only updates its color
scheme on the main thread.

Change-Id: I02be713d9705c6e0c21107db7f7de039182f601d
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 6cf4c5b98fb0e3f30379d79003ab587aadebbce7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/gui/text/coretext/qfontengine_coretext.mm | 10 +++++++---
 src/plugins/platforms/cocoa/qcocoatheme.h     |  3 +++
 src/plugins/platforms/cocoa/qcocoatheme.mm    | 19 ++++++++++++++++++-
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/gui/text/coretext/qfontengine_coretext.mm b/src/gui/text/coretext/qfontengine_coretext.mm
index 599a7f08c30..6cdba2609dc 100644
--- a/src/gui/text/coretext/qfontengine_coretext.mm
+++ b/src/gui/text/coretext/qfontengine_coretext.mm
@@ -12,6 +12,8 @@
 #include <QtGui/qpainterpath.h>
 #include <private/qcoregraphics_p.h>
 #include <private/qimage_p.h>
+#include <private/qguiapplication_p.h>
+#include <qpa/qplatformtheme.h>
 
 #include <cmath>
 
@@ -716,10 +718,12 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, const QFixedPoint &subP
             // draw with white or black fill, and then invert the glyph image in the latter case,
             // producing an alpha map. This covers the most common use-cases, but longer term we
             // should propagate the fill color all the way from the paint engine, and include it
-            //in the key for the glyph cache.
+            // in the key for the glyph cache.
 
-            if (!qt_mac_applicationIsInDarkMode())
-                return kCGColorBlack;
+            if (auto *platformTheme = QGuiApplicationPrivate::platformTheme()) {
+                if (platformTheme->colorScheme() != Qt::ColorScheme::Dark)
+                    return kCGColorBlack;
+            }
         }
         return kCGColorWhite;
     }();
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.h b/src/plugins/platforms/cocoa/qcocoatheme.h
index a7c37a685c9..90dc45264e4 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.h
+++ b/src/plugins/platforms/cocoa/qcocoatheme.h
@@ -54,6 +54,9 @@ private:
     QMacNotificationObserver m_systemColorObserver;
     mutable QHash<QPlatformTheme::Palette, QPalette*> m_palettes;
     QMacKeyValueObserver m_appearanceObserver;
+
+    Qt::ColorScheme m_colorScheme = Qt::ColorScheme::Unknown;
+    void updateColorScheme();
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm
index ac5bdf0ceb9..56171b6dc24 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ b/src/plugins/platforms/cocoa/qcocoatheme.mm
@@ -224,6 +224,8 @@ QCocoaTheme::QCocoaTheme()
         NSSystemColorsDidChangeNotification, [this] {
             handleSystemThemeChange();
     });
+
+    updateColorScheme();
 }
 
 QCocoaTheme::~QCocoaTheme()
@@ -242,6 +244,9 @@ void QCocoaTheme::reset()
 void QCocoaTheme::handleSystemThemeChange()
 {
     reset();
+
+    updateColorScheme();
+
     m_systemPalette = qt_mac_createSystemPalette();
     m_palettes = qt_mac_createRolePalettes();
 
@@ -475,7 +480,19 @@ QVariant QCocoaTheme::themeHint(ThemeHint hint) const
 
 Qt::ColorScheme QCocoaTheme::colorScheme() const
 {
-    return qt_mac_applicationIsInDarkMode() ? Qt::ColorScheme::Dark : Qt::ColorScheme::Light;
+    return m_colorScheme;
+}
+
+/*
+    Update the theme's color scheme based on the current appearance.
+
+    We can only reference the appearance on the main thread, but the
+    CoreText font engine needs to know the color scheme, and might be
+    used from secondary threads, so we cache the color scheme.
+*/
+void QCocoaTheme::updateColorScheme()
+{
+    m_colorScheme = qt_mac_applicationIsInDarkMode() ? Qt::ColorScheme::Dark : Qt::ColorScheme::Light;
 }
 
 QString QCocoaTheme::standardButtonText(int button) const