fix: prevent dragging items to fixed plugin section

panels/dock/tray/package/TrayContainer.qml

@@ -145,6 +145,7 @@ Item {
         property bool dragExited: false
         property string source: ""
         property string surfaceId: ""
+
         onEntered: function (dragEvent) {
             dragExited = false
             isDropped = false
@@ -161,11 +162,19 @@ Item {
         onPositionChanged: function (dragEvent) {
             let surfaceId = dragEvent.getDataAsString("text/x-dde-shell-tray-dnd-surfaceId")
             let pos = root.isHorizontal ? drag.x : drag.y
-            let currentItemIndex = pos / (root.itemVisualSize + root.itemSpacing)
-            let currentPosMapToItem = pos % (root.itemVisualSize + root.itemSpacing)
-            let isBefore = currentPosMapToItem < root.itemVisualSize / 2
-            dropHoverIndex = Math.floor(currentItemIndex)
+            let dropIdx = DDT.TrayItemPositionManager.itemIndexByPoint(Qt.point(drag.x, drag.y))
+            let currentItemIndex = dropIdx.index
+            let isBefore = dropIdx.isBefore            
             let isStash = dragEvent.getDataAsString("text/x-dde-shell-tray-dnd-sectionType") === "stashed"
+            dropHoverIndex = dropIdx.index
+
+            // 检查当前悬停位置是否是禁止拖拽的插件
+            let modelIndex = DDT.TraySortOrderModel.getModelIndexByVisualIndex(currentItemIndex)
+            let sectionType =root.model.data(modelIndex, DDT.TraySortOrderModel.SectionTypeRole)
+            if (sectionType === "fixed") {
+                dragEvent.accepted = false
+                return
+            }
 
             // 检查 ActionShowStashDelegate 是否显示
             let showStashActionVisible = false

panels/dock/tray/traysortordermodel.cpp

@@ -428,6 +428,7 @@ void TraySortOrderModel::updateVisualIndexes()
     // "internal/action-toggle-quick-settings"
     results = findItems("internal/action-toggle-quick-settings");
     Q_ASSERT(!results.isEmpty());
+    results[0]->setData(SECTION_FIXED, TraySortOrderModel::SectionTypeRole);
     results[0]->setData(currentVisualIndex, TraySortOrderModel::VisualIndexRole);
     currentVisualIndex++;
 
@@ -551,4 +552,18 @@ void TraySortOrderModel::handlePluginVisibleChanged(const QString &surfaceId, bo
     }
 }
 
+QModelIndex TraySortOrderModel::getModelIndexByVisualIndex(int visualIndex) const
+{
+    for (int i = 0; i < rowCount(); i++) {
+        QModelIndex index = this->index(i, 0);
+        int itemVisualIndex = data(index, VisualIndexRole).toInt();
+        bool visibility = data(index, VisibilityRole).toBool();
+
+        if (visibility && itemVisualIndex == visualIndex) {
+            return index;
+        }
+    }
+    return QModelIndex();
+}
+
 }

panels/dock/tray/traysortordermodel.h

@@ -63,6 +63,7 @@ class TraySortOrderModel : public QStandardItemModel
     Q_INVOKABLE bool dropToDockTray(const QString & draggedSurfaceId, int dropVisualIndex, bool isBefore);
     Q_INVOKABLE void setSurfaceVisible(const QString & surfaceId, bool visible);
     Q_INVOKABLE bool isDisplayedSurface(const QString &surfaceId) const;
+    Q_INVOKABLE QModelIndex getModelIndexByVisualIndex(int visualIndex) const;
 
 signals:
     void collapsedChanged(bool);