!241 chore: 优化 KDE 深色模式支持实现方式

* chore: 优化 KDE 深色模式支持实现方式
2025-12-16 05:42:04 +08:00 · 2023-10-28 12:15:45 +00:00
parent 1a98dae4f8
commit 0db7fad640
4 changed files with 161 additions and 77 deletions
--- a/src/backend/ThemeChecker.cpp
+++ b/src/backend/ThemeChecker.cpp
@@ -1,44 +1,147 @@
 #include "ThemeChecker.h"
-#include <QTimer>
-#include <QProcess>
+
+#include <QDBusConnection>
 #include <QDebug>

-ThemeChecker::ThemeChecker(QObject *parent) : QObject(parent), lastColorSchema(-1) {
-    timer = new QTimer(this);
-    connect(timer, SIGNAL(timeout()), this, SLOT(checkThemeChange()));
-    timer->start(1000);
+Q_GLOBAL_STATIC(ThemeChecker, m_instance)
+
+constexpr char kFreedesktopPortalServiceName[] = "org.freedesktop.portal.Desktop";
+constexpr char kFreedesktopPortalServicePath[] = "/org/freedesktop/portal/desktop";
+constexpr char kFreedesktopPortalSettingsInterface[] = "org.freedesktop.portal.Settings";
+
+ThemeChecker::ThemeChecker(QObject *parent)
+    : QObject(parent)
+    , m_paletteType(Dtk::Gui::DGuiApplicationHelper::instance()->paletteType())
+{
+    m_interface = new QDBusInterface(kFreedesktopPortalServiceName,
+                                     kFreedesktopPortalServicePath,
+                                     kFreedesktopPortalSettingsInterface,
+                                     QDBusConnection::sessionBus(),
+                                     this);
+
+    initThemeType();
+    initConnections();
 }

-void ThemeChecker::checkThemeChange() {
+ThemeChecker *ThemeChecker::instance()
+{
+    return m_instance;
+}

-
-    QProcess process;
-    QStringList parameters;
-    parameters << "-c" << "dbus-send --session --print-reply=literal --reply-timeout=1000 --dest=org.freedesktop.portal.Desktop /org/freedesktop/portal/desktop org.freedesktop.portal.Settings.Read string:'org.freedesktop.appearance' string:'color-scheme'";
-    process.start("/bin/sh", parameters);
-
-    if (process.waitForFinished(-1)) {
-        QString errorOutput = QString(process.readAllStandardError()).trimmed();
-        if (!errorOutput.isEmpty()) {
-            qWarning() << "检测到DBus错误:" << errorOutput;
-            return;
-        }
-
-        QString output = QString(process.readAll()).trimmed();
-        int systemColorSchema = output.right(1).toInt();
-
-        if(systemColorSchema != lastColorSchema) {
-            lastColorSchema = systemColorSchema;
-            qDebug() << "主题已更改，新的主题是：" << systemColorSchema;
-            if(systemColorSchema == 1){
-                emit themeChanged(true);
-            }
-            else if(systemColorSchema == 0 || systemColorSchema == 2){
-                emit themeChanged(false);
-            }
-        }
+bool ThemeChecker::useDarkTheme()
+{
+    if (m_paletteType == Dtk::Gui::DGuiApplicationHelper::ColorType::UnknownType) {
+        return m_themeType == Dtk::Gui::DGuiApplicationHelper::ColorType::DarkType;
    } else {
-        qWarning() << "DBus调用未能完成";
+        return m_paletteType == Dtk::Gui::DGuiApplicationHelper::ColorType::DarkType;
    }
 }

+void ThemeChecker::initThemeType()
+{
+    QVariantList args { "org.freedesktop.appearance", "color-scheme" };
+    QDBusMessage msg = m_interface->callWithArgumentList(QDBus::Block, "Read", args);
+    if (msg.type() != QDBusMessage::MessageType::ReplyMessage || msg.arguments().size() < 1) {
+        qWarning().noquote() << "Init color-scheme from D-Bus failed:" << msg.errorName() << msg.errorMessage();
+        m_themeType = Dtk::Gui::DGuiApplicationHelper::toColorType(Dtk::Gui::DGuiApplicationHelper::fetchPalette(Dtk::Gui::DGuiApplicationHelper::instance()->applicationTheme()));
+        return;
+    }
+
+    quint32 colorScheme = qvariant_cast<QDBusVariant>(qvariant_cast<QDBusVariant>(msg.arguments().first()).variant()).variant().toUInt();
+    switch (colorScheme) {
+    case 1:
+        m_themeType = Dtk::Gui::DGuiApplicationHelper::ColorType::DarkType;
+        break;
+    case 2:
+        m_themeType = Dtk::Gui::DGuiApplicationHelper::ColorType::LightType;
+        break;
+    default:
+        qInfo().noquote() << QString("color-scheme: %1, fetching themeType according to QPalette::Window").arg(colorScheme);
+        m_themeType = Dtk::Gui::DGuiApplicationHelper::toColorType(Dtk::Gui::DGuiApplicationHelper::fetchPalette(Dtk::Gui::DGuiApplicationHelper::instance()->applicationTheme()));
+        break;
+    }
+
+    if (m_paletteType == Dtk::Gui::DGuiApplicationHelper::ColorType::UnknownType) {
+        Dtk::Gui::DGuiApplicationHelper::instance()->setApplicationPalette(Dtk::Gui::DGuiApplicationHelper::standardPalette(m_themeType));
+    }
+}
+
+void ThemeChecker::initConnections()
+{
+    QDBusConnection::sessionBus().connect(kFreedesktopPortalServiceName,
+                                          kFreedesktopPortalServicePath,
+                                          kFreedesktopPortalSettingsInterface,
+                                          "SettingChanged",
+                                          this,
+                                          SLOT(slotSettingChanged(const QString &, const QString &, const QDBusVariant &)));
+
+    connect(Dtk::Gui::DGuiApplicationHelper::instance()->applicationTheme(), &Dtk::Gui::DPlatformTheme::themeNameChanged, this, &ThemeChecker::slotThemeNameChanged);
+    connect(Dtk::Gui::DGuiApplicationHelper::instance(), &Dtk::Gui::DGuiApplicationHelper::paletteTypeChanged, this, &ThemeChecker::slotPaletteTypeChanged);
+}
+
+void ThemeChecker::slotSettingChanged(const QString &_namespace, const QString &key, const QDBusVariant &variant)
+{
+    if (_namespace != "org.freedesktop.appearance" || key != "color-scheme") {
+        return;
+    }
+
+    Dtk::Gui::DGuiApplicationHelper::ColorType colorType = Dtk::Gui::DGuiApplicationHelper::ColorType::UnknownType;
+
+    quint32 colorScheme = variant.variant().toUInt();
+    switch (colorScheme) {
+    case 1:
+        colorType = Dtk::Gui::DGuiApplicationHelper::ColorType::DarkType;
+        break;
+    case 2:
+        colorType = Dtk::Gui::DGuiApplicationHelper::ColorType::LightType;
+        break;
+    default:
+        qInfo().noquote() << QString("color-scheme: %1, fetching themeType according to QPalette::Window").arg(colorScheme);
+        colorType = Dtk::Gui::DGuiApplicationHelper::toColorType(Dtk::Gui::DGuiApplicationHelper::fetchPalette(Dtk::Gui::DGuiApplicationHelper::instance()->applicationTheme()));
+        break;
+    }
+
+    if (m_paletteType != Dtk::Gui::DGuiApplicationHelper::ColorType::UnknownType) {
+        m_themeType = colorType;
+        return;
+    }
+
+    if (m_themeType != colorType) {
+        Dtk::Gui::DGuiApplicationHelper::instance()->setApplicationPalette(Dtk::Gui::DGuiApplicationHelper::standardPalette(colorType));
+        emit themeChanged(colorType == Dtk::Gui::DGuiApplicationHelper::ColorType::DarkType);
+        m_themeType = colorType;
+    }
+}
+
+void ThemeChecker::slotThemeNameChanged(const QByteArray &theme)
+{
+    Dtk::Gui::DGuiApplicationHelper::ColorType themeType = Dtk::Gui::DGuiApplicationHelper::ColorType::LightType;
+    if (theme.endsWith("dark")) {
+        themeType = Dtk::Gui::DGuiApplicationHelper::ColorType::DarkType;
+    }
+
+    if (m_paletteType != Dtk::Gui::DGuiApplicationHelper::ColorType::UnknownType) {
+        m_themeType = themeType;
+        return;
+    }
+
+    if (m_themeType != themeType) {
+        Dtk::Gui::DGuiApplicationHelper::instance()->setApplicationPalette(Dtk::Gui::DGuiApplicationHelper::standardPalette(themeType));
+        emit themeChanged(themeType == Dtk::Gui::DGuiApplicationHelper::ColorType::DarkType);
+        m_themeType = themeType;
+    }
+}
+
+void ThemeChecker::slotPaletteTypeChanged(Dtk::Gui::DGuiApplicationHelper::ColorType paletteType)
+{
+    m_paletteType = paletteType;
+
+    if (m_paletteType != Dtk::Gui::DGuiApplicationHelper::ColorType::UnknownType) {
+        Dtk::Gui::DGuiApplicationHelper::instance()->setApplicationPalette(Dtk::Gui::DGuiApplicationHelper::standardPalette(m_paletteType));
+        emit themeChanged(m_paletteType == Dtk::Gui::DGuiApplicationHelper::ColorType::DarkType);
+        return;
+    }
+
+    Dtk::Gui::DGuiApplicationHelper::instance()->setApplicationPalette(Dtk::Gui::DGuiApplicationHelper::standardPalette(m_themeType));
+    emit themeChanged(m_themeType == Dtk::Gui::DGuiApplicationHelper::ColorType::DarkType);
+}
--- a/src/backend/ThemeChecker.h
+++ b/src/backend/ThemeChecker.h
@@ -2,25 +2,39 @@
 #define THEMECHECKER_H

 #include <QObject>
-#include <QTimer>
+#include <QDBusVariant>
+#include <QDBusInterface>

+#include <DPlatformTheme>
+#include <DGuiApplicationHelper>

 class ThemeChecker : public QObject
 {
    Q_OBJECT
+
 public:
    explicit ThemeChecker(QObject *parent = nullptr);
+    static ThemeChecker *instance();
+
+    bool useDarkTheme();
+
+private:
+    void initThemeType();
+    void initConnections();

 signals:
    void themeChanged(bool isDark);

-public slots:
-    void checkThemeChange();
-
+private slots:
+    void slotSettingChanged(const QString &_namespace, const QString &key, const QDBusVariant &variant);
+    void slotThemeNameChanged(const QByteArray &theme);
+    void slotPaletteTypeChanged(Dtk::Gui::DGuiApplicationHelper::ColorType paletteType);

 private:
-    int lastColorSchema;
-    QTimer *timer;
+    QDBusInterface *m_interface = nullptr;
+
+    Dtk::Gui::DGuiApplicationHelper::ColorType m_paletteType;
+    Dtk::Gui::DGuiApplicationHelper::ColorType m_themeType;
 };

 #endif // THEMECHECKER_H