sync: from linuxdeepin/dtkdeclarative

Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#271
linuxdeepin · Jan 6, 2024 · 1a30953 · 1a30953
1 parent 5b1b075
commit 1a30953
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/dquickwindow.cpp b/src/dquickwindow.cpp
@@ -190,6 +190,12 @@ void DQuickWindowAttachedPrivate::_q_updateClipPath()
     q->setClipPathByWM(clipPath->path());
 }
 
+void DQuickWindowAttachedPrivate::_q_ensurePlatformHandle()
+{
+    if (explicitEnable && DWindowManagerHelper::instance()->hasNoTitlebar())
+        ensurePlatformHandle();
+}
+
 DQuickWindowAttached::DQuickWindowAttached(QWindow *window)
     : QObject(window)
     , DObject(*new DQuickWindowAttachedPrivate(window, this))
@@ -490,13 +496,8 @@ void DQuickWindowAttached::setEnabled(bool e)
     }
 
     if (!d->ensurePlatformHandle()) {
-        QObject::connect(DWindowManagerHelper::instance(), &DWindowManagerHelper::hasNoTitlebarChanged, this,
-                         [this] () {
-            D_D(DQuickWindowAttached);
-            if (d->explicitEnable && DWindowManagerHelper::instance()->hasNoTitlebar())
-                d->ensurePlatformHandle();
-
-        }, Qt::UniqueConnection);
+        QObject::connect(DWindowManagerHelper::instance(), SIGNAL(hasNoTitlebarChanged()), this, SLOT(_q_ensurePlatformHandle())
+                         , Qt::UniqueConnection);
     }
 }
 

diff --git a/src/dquickwindow.h b/src/dquickwindow.h
@@ -168,6 +168,7 @@ public Q_SLOTS:
     D_PRIVATE_SLOT(void _q_onWindowMotifHintsChanged(quint32))
     D_PRIVATE_SLOT(void _q_updateBlurAreaForWindow())
     D_PRIVATE_SLOT(void _q_updateClipPath())
+    D_PRIVATE_SLOT(void _q_ensurePlatformHandle())
 
     friend class DQuickBehindWindowBlur;
     friend class DQuickBehindWindowBlurPrivate;

diff --git a/src/private/dquickwindow_p.h b/src/private/dquickwindow_p.h
@@ -39,6 +39,7 @@ class DQuickWindowAttachedPrivate : public DTK_CORE_NAMESPACE::DObjectPrivate
     void updateBlurAreaFor(DQuickBehindWindowBlur *blur);
     void _q_updateBlurAreaForWindow();
     void _q_updateClipPath();
+    void _q_ensurePlatformHandle();
 
     QWindow *window = nullptr;
     DPlatformHandle *handle = nullptr;