fix: V20上部分设置项无法显示

修复了V20上透明度，背景模糊以及雷神窗口动画速度设置项不显示的问题． Log: V20上部分设置项无法显示 Signed-off-by: Yutao Meng <mengyutao@uniontech.com>
linuxdeepin · Apr 12, 2023 · 2969046 · 2969046
1 parent fdfd113
commit 2969046
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/main/service.cpp b/src/main/service.cpp
@@ -186,17 +186,15 @@ void Service::showHideOpacityAndBlurOptions(bool isShow)
 
 void Service::listenWindowEffectSwitcher()
 {
-//    if (nullptr == m_wmSwitcher) {
-//        m_wmSwitcher = new WMSwitcher(WMSwitcherService, WMSwitcherPath, QDBusConnection::sessionBus(), this);
-//        m_wmSwitcher->setObjectName("WMSwitcher");//Add by ut001000 renfeixiang 2020-08-13
-//        connect(m_wmSwitcher, &WMSwitcher::WMChanged, this, &Service::slotWMChanged, Qt::QueuedConnection);
-//    }
     QDBusConnection session = QDBusConnection::sessionBus();
     if (!session.interface()->isServiceRegistered(WMSwitcherService)) {
         qInfo() << WMSwitcherService << "Not Registered!!!!!!!";
-        return;
+        if (!session.interface()->isServiceRegistered(WMSwitcherService))
+            qInfo() << V20WMSwitcherService << "Not Registered!!!!!!!";
+        session.connect(V20WMSwitcherService, V20WMSwitcherPath, V20WMSwitcherService, "WMChanged", this, SLOT(slotWMChanged(QString)));
+    } else {
+        session.connect(WMSwitcherService, WMSwitcherPath, WMSwitcherService, "WMChanged", this, SLOT(slotWMChanged(QString)));
     }
-    session.connect(WMSwitcherService, WMSwitcherPath, WMSwitcherService, "WMChanged", this, SLOT(slotWMChanged(QString)));
 }
 
 void Service::slotWMChanged(const QString &wmName)
@@ -211,7 +209,12 @@ void Service::slotWMChanged(const QString &wmName)
 
 bool Service::isWindowEffectEnabled()
 {
-    QDBusMessage msg = QDBusMessage::createMethodCall(WMSwitcherService, WMSwitcherPath, WMSwitcherService, "CurrentWM");
+    QDBusConnection session = QDBusConnection::sessionBus();
+    QDBusMessage msg;
+    if (session.interface()->isServiceRegistered(WMSwitcherService))
+        msg = QDBusMessage::createMethodCall(WMSwitcherService, WMSwitcherPath, WMSwitcherService, "CurrentWM");
+    else
+        msg = QDBusMessage::createMethodCall(V20WMSwitcherService, V20WMSwitcherPath, V20WMSwitcherService, "CurrentWM");
 
     QDBusMessage response = QDBusConnection::sessionBus().call(msg);
     if (response.type() == QDBusMessage::ReplyMessage) {

diff --git a/src/main/service.h b/src/main/service.h
@@ -19,11 +19,13 @@
 #include <QSharedMemory>
 #include <QMap>
 
-//#include <com_deepin_wmswitcher.h>
+#include <com_deepin_wmswitcher.h>
 
 DWIDGET_USE_NAMESPACE
 
-//using WMSwitcher = com::deepin::WMSwitcher;
+using WMSwitcher = com::deepin::WMSwitcher;
+#define V20WMSwitcherService "com.deepin.WMSwitcher"
+#define V20WMSwitcherPath "/com/deepin/WMSwitcher"
 #define WMSwitcherService "org.deepin.dde.WMSwitcher1"
 #define WMSwitcherPath "/org/deepin/dde/WMSwitcher1"