feat: rewrite PopupHandle for Qt6 with Window popupType support

examples/qml-inspect/Example_Popup.qml

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
@@ -68,12 +68,6 @@ Column {
             }
         }
     }
-    Button {
-        text: "handle forceWindowMode"
-        onClicked: {
-            popupWindow.PopupHandle.forceWindowMode = !popupWindow.PopupHandle.forceWindowMode
-        }
-    }
 
     Popup {
         id: popupWindow; objectName: "pupup window"
@@ -85,10 +79,25 @@ Column {
 //        width: 300
 //        height: 300
 //        margins: 100
-        PopupHandle.forceWindowMode: true
-        PopupHandle.delegate: PopupWindow {
-            blurControl: popupWindow
-        }
+
+        // Test window properties in Qt6
+        // popupType: Popup.Window
+        // PopupHandle.windowRadius: 18
+        // PopupHandle.borderWidth: 2
+        // PopupHandle.borderColor: "red"
+        // PopupHandle.shadowRadius: 30
+        // PopupHandle.shadowOffset: Qt.point(0, 4)
+        // PopupHandle.shadowColor: Qt.rgba(0, 0, 0, 0.5)
+        // PopupHandle.translucentBackground: true
+        // PopupHandle.enableBlurWindow: true
+
+        // Component.onCompleted: {
+        //     console.log("=== Popup Properties ===")
+        //     console.log("windowRadius:", PopupHandle.windowRadius)
+        //     console.log("borderWidth:", PopupHandle.borderWidth)
+        //     console.log("borderColor:", PopupHandle.borderColor)
+        //     console.log("translucentBackground:", PopupHandle.translucentBackground)
+        // }
         contentItem: Column {
             spacing: 10
             Text {
@@ -125,8 +134,6 @@ Column {
     Menu {
         id: menuPopup
         MenuItem { text: "Text" }
-
-        PopupHandle.forceWindowMode: true
     }
     ArrowShapePopup {
         id: arrow

qmlplugin/qmlplugin_plugin.cpp

@@ -22,7 +22,6 @@
 #include "private/dquickiconlabel_p.h"
 #include "private/dsettingscontainer_p.h"
 #include "private/dmessagemanager_p.h"
-#include "private/dpopupwindowhandle_p.h"
 #include "private/dobjectmodelproxy_p.h"
 #include "private/dquickwaterprogressattribute_p.h"
 #include "private/dquickarrowboxpath_p.h"
@@ -208,7 +207,6 @@ void QmlpluginPlugin::registerTypes(const char *uri)
                                                            QStringLiteral("ColorSelector is only available as an attached property."));
     dtkRegisterUncreatableType<DColor>(uri, implUri, 1, 0, "Color",
                                        QStringLiteral("Color is only available as enums."));
-    dtkRegisterUncreatableType<DPopupWindowHandle>(uri, implUri, 1, 0, "PopupHandle", "PopupWindow Attached");
     dtkRegisterUncreatableType<DPlatformHandle>(uri, implUri, 1, 0, "PlatformHandle", "PlatformHandle");
 
     qRegisterMetaType<DQUICK_NAMESPACE::DQuickDciIcon>();

qt6/src/qml/Menu.qml

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
@@ -39,9 +39,6 @@ T.Menu {
 
     delegate: MenuItem { }
 
-    D.PopupHandle.delegate: PopupWindow {
-        blurControl: control
-    }
 
     contentItem: FocusScope {
         // QTBUG-99897 focus doesn't be clear.

src/dquickwindow.cpp

@@ -56,6 +56,11 @@ DQuickWindowAttached *DQuickWindow::qmlAttachedProperties(QObject *object)
     if (window) {
         return new DQuickWindowAttached(window);
     }
+
+    // Support QQuickPopup with popupType == Window
+    if (object && object->inherits("QQuickPopup")) {
+        return new DQuickWindowAttached(object);
+    }
 
     return nullptr;
 }
@@ -131,6 +136,10 @@ bool DQuickWindowAttachedPrivate::ensurePlatformHandle()
     if (handle)
         return true;
 
+    if (!window) {
+        return false;
+    }
+
     if (!DPlatformHandle::setEnabledNoTitlebarForWindow(window, true)) {
         qWarning() << "Failed to enable NoTitlebar for the window:"  << window;
         return false;
@@ -179,10 +188,32 @@ void DQuickWindowAttachedPrivate::destoryPlatformHandle()
     handle = nullptr;
 }
 
+void DQuickWindowAttachedPrivate::setWindow(QWindow *newWindow)
+{
+    Q_Q(DQuickWindowAttached);
+
+    if (window == newWindow)
+        return;
+
+    window = newWindow;
+
+    if (newWindow) {
+        newWindow->installEventFilter(q);
+        QObject::connect(DWindowManagerHelper::instance(), SIGNAL(windowMotifWMHintsChanged(quint32)),
+                     q, SLOT(_q_onWindowMotifHintsChanged(quint32)), Qt::UniqueConnection);
+
+        if (explicitEnable == True) {
+            ensurePlatformHandle();
+        }
+    }
+}
+
 void DQuickWindowAttachedPrivate::_q_onWindowMotifHintsChanged(quint32 winId)
 {
     D_Q(DQuickWindowAttached);
 
+    if (!q->window())
+        return;
     if (q->window()->winId() != winId)
         return;
 
@@ -339,9 +370,22 @@ DQuickWindowAttached::DQuickWindowAttached(QWindow *window)
                      this, SLOT(_q_onWindowMotifHintsChanged(quint32)));
 }
 
+DQuickWindowAttached::DQuickWindowAttached(QObject *popupObject)
+    : QObject(popupObject)
+    , DObject(*new DQuickWindowAttachedPrivate(nullptr, this))
+{
+}
+
 QQuickWindow *DQuickWindowAttached::window() const
 {
-    return qobject_cast<QQuickWindow *>(parent());
+    D_DC(DQuickWindowAttached);
+    return qobject_cast<QQuickWindow *>(d->window);
+}
+
+void DQuickWindowAttached::setWindow(QQuickWindow *window)
+{
+    D_D(DQuickWindowAttached);
+    d->setWindow(window);
 }
 
 /*!

src/dquickwindow.h

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2020 - 2022 UnionTech Software Technology Co., Ltd.
+// SPDX-FileCopyrightText: 2020 - 2026 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
@@ -80,8 +80,10 @@ class DQuickWindowAttached : public QObject, public DTK_CORE_NAMESPACE::DObject
 
 public:
     explicit DQuickWindowAttached(QWindow *window);
+    explicit DQuickWindowAttached(QObject *popupObject);
 
     QQuickWindow *window() const;
+    void setWindow(QQuickWindow *window);
     bool isEnabled() const;
 
     int windowRadius() const;