1 files changed, 86 insertions, 18 deletions

diff --git a/src/plugins/platforms/ios/qiostheme.mm b/src/plugins/platforms/ios/qiostheme.mm
index 02143bd7a2..0b420a875a 100644
--- a/src/plugins/platforms/ios/qiostheme.mm
+++ b/src/plugins/platforms/ios/qiostheme.mm
@@ -11,16 +11,24 @@
 #include <QtGui/private/qcoregraphics_p.h>
 
 #include <QtGui/private/qcoretextfontdatabase_p.h>
+#include <QtGui/private/qappleiconengine_p.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
 
 #include <UIKit/UIFont.h>
 #include <UIKit/UIInterface.h>
 
-#ifndef Q_OS_TVOS
+#if !defined(Q_OS_TVOS) && !defined(Q_OS_VISIONOS)
 #include "qiosmenu.h"
+#endif
+
+#if !defined(Q_OS_TVOS)
 #include "qiosfiledialog.h"
+#include "qioscolordialog.h"
+#include "qiosfontdialog.h"
 #include "qiosmessagedialog.h"
+#include "qiosscreen.h"
+#include "quiwindow.h"
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -66,6 +74,9 @@ void QIOSTheme::initializeSystemPalette()
 
     s_systemPalette.setBrush(QPalette::Highlight, QColor(11, 70, 150, 60));
     s_systemPalette.setBrush(QPalette::HighlightedText, qt_mac_toQBrush(UIColor.labelColor.CGColor));
+
+    if (@available(ios 15.0, *))
+        s_systemPalette.setBrush(QPalette::Accent, qt_mac_toQBrush(UIColor.tintColor.CGColor));
 }
 
 const QPalette *QIOSTheme::palette(QPlatformTheme::Palette type) const
@@ -75,29 +86,25 @@ const QPalette *QIOSTheme::palette(QPlatformTheme::Palette type) const
     return 0;
 }
 
+#if !defined(Q_OS_TVOS) && !defined(Q_OS_VISIONOS)
 QPlatformMenuItem* QIOSTheme::createPlatformMenuItem() const
 {
-#ifdef Q_OS_TVOS
-    return 0;
-#else
-    return new QIOSMenuItem();
-#endif
+    return new QIOSMenuItem;
 }
 
 QPlatformMenu* QIOSTheme::createPlatformMenu() const
 {
-#ifdef Q_OS_TVOS
-    return 0;
-#else
-    return new QIOSMenu();
-#endif
+    return new QIOSMenu;
 }
+#endif
 
 bool QIOSTheme::usePlatformNativeDialog(QPlatformTheme::DialogType type) const
 {
     switch (type) {
     case FileDialog:
     case MessageDialog:
+    case ColorDialog:
+    case FontDialog:
         return !qt_apple_isApplicationExtension();
     default:
         return false;
@@ -114,6 +121,12 @@ QPlatformDialogHelper *QIOSTheme::createPlatformDialogHelper(QPlatformTheme::Dia
     case MessageDialog:
         return new QIOSMessageDialog();
         break;
+    case ColorDialog:
+        return new QIOSColorDialog();
+        break;
+    case FontDialog:
+        return new QIOSFontDialog();
+        break;
 #endif
     default:
         return 0;
@@ -132,15 +145,65 @@ QVariant QIOSTheme::themeHint(ThemeHint hint) const
     }
 }
 
-QPlatformTheme::Appearance QIOSTheme::appearance() const
+Qt::ColorScheme QIOSTheme::colorScheme() const
 {
-    if (UIWindow *window = qt_apple_sharedApplication().windows.lastObject) {
-        return window.rootViewController.traitCollection.userInterfaceStyle
-                == UIUserInterfaceStyleDark
-                ? QPlatformTheme::Appearance::Dark
-                : QPlatformTheme::Appearance::Light;
+#if defined(Q_OS_VISIONOS)
+    // On visionOS the concept of light or dark mode does not
+    // apply, as the UI is constantly changing based on what
+    // the lighting conditions are outside the headset, but
+    // the OS reports itself as always being in dark mode.
+    return Qt::ColorScheme::Dark;
+#else
+    if (s_colorSchemeOverride != Qt::ColorScheme::Unknown)
+        return s_colorSchemeOverride;
+
+    // Set the appearance based on the QUIWindow
+    // Fallback to the UIScreen if no window is created yet
+    UIUserInterfaceStyle appearance = UIScreen.mainScreen.traitCollection.userInterfaceStyle;
+    NSArray<UIWindow *> *windows = qt_apple_sharedApplication().windows;
+    for (UIWindow *window in windows) {
+        if ([window isKindOfClass:[QUIWindow class]]) {
+            appearance = static_cast<QUIWindow*>(window).traitCollection.userInterfaceStyle;
+            break;
+        }
     }
-    return QPlatformTheme::Appearance::Unknown;
+
+    return appearance == UIUserInterfaceStyleDark
+                       ? Qt::ColorScheme::Dark
+                       : Qt::ColorScheme::Light;
+#endif
+}
+
+void QIOSTheme::requestColorScheme(Qt::ColorScheme scheme)
+{
+#if defined(Q_OS_VISIONOS)
+    Q_UNUSED(scheme);
+#else
+    s_colorSchemeOverride = scheme;
+
+    const NSArray<UIWindow *> *windows = qt_apple_sharedApplication().windows;
+    for (UIWindow *window in windows) {
+        // don't apply a theme to windows we don't own
+        if (qt_objc_cast<QUIWindow*>(window))
+            applyTheme(window);
+    }
+#endif
+}
+
+void QIOSTheme::applyTheme(UIWindow *window)
+{
+    const UIUserInterfaceStyle style = []{
+        switch (s_colorSchemeOverride) {
+        case Qt::ColorScheme::Dark:
+            return UIUserInterfaceStyleDark;
+        case Qt::ColorScheme::Light:
+            return UIUserInterfaceStyleLight;
+        case Qt::ColorScheme::Unknown:
+            return UIUserInterfaceStyleUnspecified;
+        }
+    }();
+
+    window.overrideUserInterfaceStyle = style;
 }
 
 const QFont *QIOSTheme::font(Font type) const
@@ -150,4 +213,9 @@ const QFont *QIOSTheme::font(Font type) const
     return coreTextFontDatabase->themeFont(type);
 }
 
+QIconEngine *QIOSTheme::createIconEngine(const QString &iconName) const
+{
+    return new QAppleIconEngine(iconName);
+}
+
 QT_END_NAMESPACE