From 6e1cfd82ddacd59649abfcef73e3e412d61a51d3 Mon Sep 17 00:00:00 2001
From: Ye ShanShan <yeshanshan@uniontech.com>
Date: Tue, 14 May 2024 18:22:15 +0800
Subject: [PATCH 1/3] fix: missing blur for Menu when it's parent is clip

We use window instead of Item as Menu's parent.

TODO: it's a bug for dtk.

Issue: https://github.com/linuxdeepin/developer-center/issues/8468
---
 qml/FolderGridViewPopup.qml | 3 ++-
 qml/Main.qml                | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/qml/FolderGridViewPopup.qml b/qml/FolderGridViewPopup.qml
index 86b2031a..0e724145 100644
--- a/qml/FolderGridViewPopup.qml
+++ b/qml/FolderGridViewPopup.qml
@@ -129,13 +129,14 @@ Popup {
 
                     SwipeView {
                         id: folderPagesView
-                        clip: true
+                        clip: gridViews.count > 1
 
                         anchors.fill: parent
 
                         currentIndex: folderPageIndicator.currentIndex
 
                         Repeater {
+                            id: gridViews
                             model: ItemArrangementProxyModel.pageCount(folderLoader.currentFolderId) // FIXME: should be a property?
 
                             Loader {
diff --git a/qml/Main.qml b/qml/Main.qml
index 16d88a40..74133cd8 100644
--- a/qml/Main.qml
+++ b/qml/Main.qml
@@ -60,7 +60,13 @@ QtObject {
     property var activeMenu: null
     property Component appContextMenuCom: AppItemMenu { }
     function showContextMenu(obj, model, additionalProps = {}) {
-        const menu = appContextMenuCom.createObject(obj, Object.assign({
+        if (!obj || !obj.Window.window) {
+            console.log("obj or obj.Window.window is null")
+            return
+        }
+        closeContextMenu()
+
+        const menu = appContextMenuCom.createObject(obj.Window.window.contentItem, Object.assign({
             display: model.display,
             desktopId: model.desktopId,
             iconName: model.iconName,

From ef3e6015f0c52e6ad99b0ee11825bc190bd7a121 Mon Sep 17 00:00:00 2001
From: Ye ShanShan <yeshanshan@uniontech.com>
Date: Tue, 14 May 2024 18:44:15 +0800
Subject: [PATCH 2/3] fix: more than one hover status for Menu

We close Menu manully in other commit.

Issue: https://github.com/linuxdeepin/developer-center/issues/8571
---
 qml/AppItemMenu.qml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qml/AppItemMenu.qml b/qml/AppItemMenu.qml
index b935897d..118dfe3a 100644
--- a/qml/AppItemMenu.qml
+++ b/qml/AppItemMenu.qml
@@ -26,7 +26,8 @@ Loader {
 
         Menu {
             id: contextMenu
-            modal: true
+
+            // modal: true //https://github.com/linuxdeepin/developer-center/issues/8571
 
             MenuItem {
                 text: qsTr("Open")

From 2d21120214c61b69ac3a68c2ece53ad1ad68566d Mon Sep 17 00:00:00 2001
From: Ye ShanShan <yeshanshan@uniontech.com>
Date: Tue, 14 May 2024 18:27:22 +0800
Subject: [PATCH 3/3] chore: release dde-launchpad 0.6.12

update changelog.
---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 87bf7318..d1fc4cb6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dde-launchpad (0.6.12) unstable; urgency=medium
+
+  * fix: dde-control-center can be uninstalled
+  * fix: missing blur for Menu when it's parent is clip(Issue: https://github.com/linuxdeepin/developer-center/issues/8468)
+
+ -- YeShanShan <yeshanshan@deepin.org>  Tue, 14 May 2024 18:26:49 +0800
+
 dde-launchpad (0.6.11) unstable; urgency=medium
 
   * Fix search result overflow