1 files changed, 40 insertions, 18 deletions

diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
index 60d5474ed2..355d3e6cc9 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportaltheme.cpp
@@ -20,8 +20,9 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-class QXdgDesktopPortalThemePrivate : public QPlatformThemePrivate
-{
+class QXdgDesktopPortalThemePrivate : public QObject
+    {
+    Q_OBJECT
 public:
     enum XdgColorschemePref {
         None,
@@ -30,7 +31,7 @@ public:
     };
 
     QXdgDesktopPortalThemePrivate()
-        : QPlatformThemePrivate()
+        : QObject()
     { }
 
     ~QXdgDesktopPortalThemePrivate()
@@ -40,7 +41,7 @@ public:
 
     /*! \internal
 
-        Converts the given Freedesktop color scheme setting \a colorschemePref to a QPlatformTheme::Appearance value.
+        Converts the given Freedesktop color scheme setting \a colorschemePref to a Qt::ColorScheme value.
         Specification: https://github.com/flatpak/xdg-desktop-portal/blob/d7a304a00697d7d608821253cd013f3b97ac0fb6/data/org.freedesktop.impl.portal.Settings.xml#L33-L45
 
         Unfortunately the enum numerical values are not defined identically, so we have to convert them.
@@ -53,18 +54,29 @@ public:
         1: Prefer dark appearance           | 2: Dark
         2: Prefer light appearance          | 1: Light
     */
-    static QPlatformTheme::Appearance appearanceFromXdgPref(const XdgColorschemePref colorschemePref)
+    static Qt::ColorScheme colorSchemeFromXdgPref(const XdgColorschemePref colorschemePref)
     {
         switch (colorschemePref) {
-            case PreferDark: return QPlatformTheme::Appearance::Dark;
-            case PreferLight: return QPlatformTheme::Appearance::Light;
-            default: return QPlatformTheme::Appearance::Unknown;
+            case PreferDark: return Qt::ColorScheme::Dark;
+            case PreferLight: return Qt::ColorScheme::Light;
+            default: return Qt::ColorScheme::Unknown;
         }
     }
 
+public Q_SLOTS:
+    void settingChanged(const QString &group, const QString &key,
+                        const QDBusVariant &value)
+    {
+        if (group == "org.freedesktop.appearance"_L1 && key == "color-scheme"_L1) {
+            colorScheme = colorSchemeFromXdgPref(static_cast<XdgColorschemePref>(value.variant().toUInt()));
+            QWindowSystemInterface::handleThemeChange();
+        }
+    }
+
+public:
     QPlatformTheme *baseTheme = nullptr;
     uint fileChooserPortalVersion = 0;
-    QPlatformTheme::Appearance appearance = QPlatformTheme::Appearance::Unknown;
+    Qt::ColorScheme colorScheme = Qt::ColorScheme::Unknown;
 };
 
 QXdgDesktopPortalTheme::QXdgDesktopPortalTheme()
@@ -75,7 +87,7 @@ QXdgDesktopPortalTheme::QXdgDesktopPortalTheme()
     QStringList themeNames;
     themeNames += QGuiApplicationPrivate::platform_integration->themeNames();
     // 1) Look for a theme plugin.
-    for (const QString &themeName : qAsConst(themeNames)) {
+    for (const QString &themeName : std::as_const(themeNames)) {
         d->baseTheme = QPlatformThemeFactory::create(themeName, nullptr);
         if (d->baseTheme)
             break;
@@ -84,7 +96,7 @@ QXdgDesktopPortalTheme::QXdgDesktopPortalTheme()
     // 2) If no theme plugin was found ask the platform integration to
     // create a theme
     if (!d->baseTheme) {
-        for (const QString &themeName : qAsConst(themeNames)) {
+        for (const QString &themeName : std::as_const(themeNames)) {
             d->baseTheme = QGuiApplicationPrivate::platform_integration->createPlatformTheme(themeName);
             if (d->baseTheme)
                 break;
@@ -104,7 +116,7 @@ QXdgDesktopPortalTheme::QXdgDesktopPortalTheme()
     message << "org.freedesktop.portal.FileChooser"_L1 << "version"_L1;
     QDBusPendingCall pendingCall = QDBusConnection::sessionBus().asyncCall(message);
     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall);
-    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, [d] (QDBusPendingCallWatcher *watcher) {
+    QObject::connect(watcher, &QDBusPendingCallWatcher::finished, watcher, [d] (QDBusPendingCallWatcher *watcher) {
         QDBusPendingReply<QVariant> reply = *watcher;
         if (reply.isValid()) {
             d->fileChooserPortalVersion = reply.value().toUInt();
@@ -124,8 +136,13 @@ QXdgDesktopPortalTheme::QXdgDesktopPortalTheme()
     if (reply.isValid()) {
         const QDBusVariant dbusVariant = qvariant_cast<QDBusVariant>(reply.value());
         const QXdgDesktopPortalThemePrivate::XdgColorschemePref xdgPref = static_cast<QXdgDesktopPortalThemePrivate::XdgColorschemePref>(dbusVariant.variant().toUInt());
-        d->appearance = QXdgDesktopPortalThemePrivate::appearanceFromXdgPref(xdgPref);
+        d->colorScheme = QXdgDesktopPortalThemePrivate::colorSchemeFromXdgPref(xdgPref);
     }
+
+    QDBusConnection::sessionBus().connect(
+            "org.freedesktop.portal.Desktop"_L1, "/org/freedesktop/portal/desktop"_L1,
+            "org.freedesktop.portal.Settings"_L1, "SettingChanged"_L1, d_ptr.get(),
+            SLOT(settingChanged(QString, QString, QDBusVariant)));
 }
 
 QPlatformMenuItem* QXdgDesktopPortalTheme::createPlatformMenuItem() const
@@ -166,11 +183,12 @@ QPlatformDialogHelper* QXdgDesktopPortalTheme::createPlatformDialogHelper(Dialog
 {
     Q_D(const QXdgDesktopPortalTheme);
 
-    if (type == FileDialog) {
+    if (type == FileDialog && d->fileChooserPortalVersion) {
         // Older versions of FileChooser portal don't support opening directories, therefore we fallback
         // to native file dialog opened inside the sandbox to open a directory.
-        if (d->fileChooserPortalVersion < 3 && d->baseTheme->usePlatformNativeDialog(type))
-            return new QXdgDesktopPortalFileDialog(static_cast<QPlatformFileDialogHelper*>(d->baseTheme->createPlatformDialogHelper(type)));
+        if (d->baseTheme->usePlatformNativeDialog(type))
+            return new QXdgDesktopPortalFileDialog(static_cast<QPlatformFileDialogHelper*>(d->baseTheme->createPlatformDialogHelper(type)),
+                                                   d->fileChooserPortalVersion);
 
         return new QXdgDesktopPortalFileDialog;
     }
@@ -204,10 +222,12 @@ QVariant QXdgDesktopPortalTheme::themeHint(ThemeHint hint) const
     return d->baseTheme->themeHint(hint);
 }
 
-QPlatformTheme::Appearance QXdgDesktopPortalTheme::appearance() const
+Qt::ColorScheme QXdgDesktopPortalTheme::colorScheme() const
 {
     Q_D(const QXdgDesktopPortalTheme);
-    return d->appearance;
+    if (d->colorScheme == Qt::ColorScheme::Unknown)
+        return d->baseTheme->colorScheme();
+    return d->colorScheme;
 }
 
 QPixmap QXdgDesktopPortalTheme::standardPixmap(StandardPixmap sp, const QSizeF &size) const
@@ -244,3 +264,5 @@ QString QXdgDesktopPortalTheme::standardButtonText(int button) const
 }
 
 QT_END_NAMESPACE
+
+#include "qxdgdesktopportaltheme.moc"