fix: dock became normal window

not set window flag log: as title
linuxdeepin · Mar 29, 2024 · 86d0eb3 · 86d0eb3
1 parent 19e0670
commit 86d0eb3
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/frame/layershell/x11dlayershellemulation.cpp b/frame/layershell/x11dlayershellemulation.cpp
@@ -23,7 +23,6 @@ LayerShellEmulation::LayerShellEmulation(QWindow* window, QObject *parent)
     , m_window(window)
     , m_dlayerShellWindow(DLayerShellWindow::get(m_window))
 {
-    m_window->setFlag(Qt::FramelessWindowHint);
     onLayerChanged();
     connect(m_dlayerShellWindow, &DLayerShellWindow::layerChanged, this, &LayerShellEmulation::onLayerChanged);
 
@@ -59,7 +58,6 @@ void LayerShellEmulation::onLayerChanged()
     auto xcbWindow = dynamic_cast<QNativeInterface::Private::QXcbWindow*>(m_window->handle());
     switch (m_dlayerShellWindow->layer()) {
         case DLayerShellWindow::LayerBackground: {
-            m_window->setFlags(m_window->flags() & ~Qt::WindowStaysOnBottomHint);
             xcbWindow->setWindowType(QNativeInterface::Private::QXcbWindow::Desktop);
             break;
         }
@@ -70,15 +68,13 @@ void LayerShellEmulation::onLayerChanged()
             break;
         }
         case DLayerShellWindow::LayerTop: {
-            m_window->setFlags(m_window->flags() & ~Qt::WindowStaysOnBottomHint);
             xcbWindow->setWindowType(QNativeInterface::Private::QXcbWindow::Dock);
             break;
         }
         case DLayerShellWindow::LayerOverlay: {
             // on deepin Notification will be influenced by exclusionZone,
             // while plasma works all right, maybe deepin kwin bug?
             // FIXME: fix above
-            m_window->setFlags(m_window->flags() & ~Qt::WindowStaysOnBottomHint);
             xcbWindow->setWindowType(QNativeInterface::Private::QXcbWindow::Notification);
             break;
         }

diff --git a/shell/appletloader.cpp b/shell/appletloader.cpp
@@ -14,9 +14,11 @@
 #include <QMap>
 #include <QLoggingCategory>
 #include <QElapsedTimer>
+#include <DWindowManagerHelper>
 
 DS_BEGIN_NAMESPACE
 DCORE_USE_NAMESPACE;
+DGUI_USE_NAMESPACE
 
 Q_LOGGING_CATEGORY(dsLoaderLog, "dde.shell.loader")
 
@@ -126,8 +128,20 @@ void DAppletLoaderPrivate::doCreateRootObject(DApplet *applet)
             Q_EMIT q->failed();
         }
     });
-    if (!engine->create()) {
-        engine->deleteLater();
+
+    // FIXME: kwin load slowly make blur or other effets not ready, should in dtk to ensure effects loaded
+    if (DWindowManagerHelper::instance()->hasNoTitlebar()) {
+        if (!engine->create()) {
+            engine->deleteLater();
+        }
+    } else {
+        QObject::connect(DWindowManagerHelper::instance(), &DWindowManagerHelper::hasNoTitlebarChanged, applet, [engine, applet] () {
+            if (DWindowManagerHelper::instance()->hasNoTitlebar()) {
+                if (!engine->create()) {
+                    engine->deleteLater();
+                }
+            }
+        });
     }
 }
 

diff --git a/shell/main.cpp b/shell/main.cpp
@@ -11,6 +11,8 @@
 
 #include <csignal>
 #include <iostream>
+#include <qnamespace.h>
+#include <qobjectdefs.h>
 
 #include "applet.h"
 #include "containment.h"
@@ -146,8 +148,21 @@ int main(int argc, char *argv[])
         DPluginLoader::instance()->setDisabledApplets(disabledApplets);
     }
 
+    qCInfo(dsLog) << "Loading plugin id" << pluginIds;
+    for (const auto &pluginId : pluginIds) {
+        auto applet = DPluginLoader::instance()->loadApplet(DAppletData{pluginId});
+        if (!applet) {
+            qCWarning(dsLog) << "Loading plugin failed:" << pluginId;
+            continue;
+        }
+        applets << applet;
+    }
+
     AppletManager manager(pluginIds);
-    manager.exec();
+
+    QMetaObject::invokeMethod(&a, [&manager](){
+        manager.exec();
+    }, Qt::QueuedConnection);
 
     QObject::connect(qApp, &QCoreApplication::aboutToQuit, qApp, [&manager]() {
         qCInfo(dsLog) << "Exit dde-shell.";