fix: use proper dock DnD MIME data

对于将应用拖拽到Dock上固定的场景使用正确的MIME数据，并在不允许某应用固定到Dock上时不加入此MIME数据，以阻止Dock接受拖拽事件。此提交是占位包需求遗留问题的修复。 Log: Bug: https://pms.uniontech.com/bug-view-279155.html
linuxdeepin · Oct 18, 2024 · efa6c46 · efa6c46
1 parent 85906c1
commit efa6c46
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/qml/FolderGridViewPopup.qml b/qml/FolderGridViewPopup.qml
@@ -269,9 +269,7 @@ Popup {
                                             anchors.fill: parent
                                             dndEnabled: true
                                             displayFont: isWindowedMode ? DTK.fontManager.t9 : DTK.fontManager.t6
-                                            Drag.mimeData: {
-                                                "text/x-dde-launcher-dnd-desktopId": model.desktopId
-                                            }
+                                            Drag.mimeData: Helper.generateDragMimeData(model.desktopId)
                                             visible: dndItem.currentlyDraggedId !== model.desktopId
                                             iconSource: iconName
 

diff --git a/qml/FullscreenFrame.qml b/qml/FullscreenFrame.qml
@@ -465,9 +465,7 @@ InputEventItem {
                                         margins: 5
                                     }
                                     dndEnabled: !folderGridViewPopup.opened
-                                    Drag.mimeData: {
-                                        "text/x-dde-launcher-dnd-desktopId": model.desktopId
-                                    }
+                                    Drag.mimeData: Helper.generateDragMimeData(model.desktopId)
                                     visible: dndItem.currentlyDraggedId !== model.desktopId
                                     iconSource: (iconName && iconName !== "") ? iconName : "application-x-desktop"
                                     icons: folderIcons

diff --git a/qml/Helper.qml b/qml/Helper.qml
@@ -48,4 +48,14 @@ QtObject {
             crystal: itemBackgroundColor.hoveredDarkColor
         }
     }
+
+    function generateDragMimeData(desktopId) {
+        // In some cases an app is not allowed to be pinned onto dock via drag-n-drop;
+        // We only insert the MIME data for dde-dock in those allowed cases.
+        var mime = { "text/x-dde-launcher-dnd-desktopId": desktopId }
+        if (!DesktopIntegration.appIsDummyPackage(desktopId)) {
+            mime["text/x-dde-dock-dnd-appid"] = desktopId
+        }
+        return mime
+    }
 }
diff --git a/qml/windowed/FreeSortListView.qml b/qml/windowed/FreeSortListView.qml
@@ -164,9 +164,7 @@ Item {
                 Drag.hotSpot.y: height / 2
                 Drag.dragType: Drag.Automatic
                 Drag.active: mouseArea.drag.active
-                Drag.mimeData: {
-                    "text/x-dde-launcher-dnd-desktopId": model.desktopId
-                }
+                Drag.mimeData: Helper.generateDragMimeData(model.desktopId)
 
                 background: ItemBackground {
                     id: bg