chore: bump version to 2.0.16

robertkill · robertkill · commit 1ef99ed75476 · 2025-10-30T20:11:25.000+08:00
update changelog to 2.0.16
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,18 @@
+dde-shell (2.0.16) unstable; urgency=medium
+
+  * feat: implement trash empty state detection
+  * feat: add camera status OSD notifications
+  * i18n: Updates for project Deepin Desktop Environment (#1315)
+  * fix: disable dock panel dragging when locked
+  * fix: correct bubble ID handling in notification system
+  * feat: set focus to first expanded notification item
+  * feat: enhance window identification with ApplicationManager
+  * feat: add modal property to notification setting menu
+  * refactor: optimize expired notification cleanup implementation
+  * Revert "feat: add trash file drop support"
+
+ -- Robertkill <lvpeilong@uniontech.com>  Thu, 30 Oct 2025 20:11:23 +0800
+
 dde-shell (2.0.15) unstable; urgency=medium
 
   * fix: add missing definitions for dockpanel
diff --git a/frame/qml/PanelToolTip.qml b/frame/qml/PanelToolTip.qml
@@ -46,6 +46,7 @@ Item {
 
     function open()
     {
+        console.warn("PanelToolTip::open called for text:", text)
         if (!toolTipWindow)
             return
 
@@ -73,6 +74,7 @@ Item {
     
     function close()
     {
+        console.warn("PanelToolTip::close called for text:", text)
         if (!toolTipWindow)
             return
 
diff --git a/panels/dock/dockpositioner.cpp b/panels/dock/dockpositioner.cpp
@@ -103,6 +103,43 @@ void DockPositioner::setY(int y)
 
 void DockPositioner::update()
 {
+    // 如果位置没有实质性变化，不重新计算
+    const auto newBounding = m_bounding;
+    const auto dockWindowRect = dockGeometry();
+    
+    int xPosition = 0;
+    int yPosition = 0;
+    switch (dockPosition()) {
+    case dock::Top: {
+        xPosition = newBounding.x();
+        yPosition = newBounding.y();
+        break;
+    }
+    case dock::Right: {
+        xPosition = newBounding.x() - newBounding.width();
+        yPosition = newBounding.y();
+        break;
+    }
+    case dock::Bottom: {
+        xPosition = newBounding.x();
+        yPosition = newBounding.y() - newBounding.height();
+        break;
+    }
+    case dock::Left: {
+        xPosition = newBounding.x();
+        yPosition = newBounding.y();
+        break;
+    }
+    default:
+        break;
+    }
+    
+    // 如果新计算的位置与当前位置相同，不触发更新
+    if (m_x == xPosition && m_y == yPosition) {
+        qWarning() << "DockPositioner::update: position unchanged, skipping update";
+        return;
+    }
+    
     m_positionTimer->start();
 }
 
@@ -201,6 +238,10 @@ void DockPanelPositioner::updatePosition()
     int yPosition = 0;
     int horizontalOffset = m_horizontalOffset == -1 ? m_bounding.width() / 2 : m_horizontalOffset;
     int vertialOffset = m_vertialOffset == -1 ? m_bounding.height() / 2 : m_vertialOffset;
+    
+    qWarning() << "DockPanelPositioner::updatePosition called for" << parent()->objectName()
+               << "bounding:" << m_bounding << "dockPosition:" << dockPosition();
+    
     switch (dockPosition()) {
     case dock::Top: {
         xPosition = m_bounding.x() - horizontalOffset;
@@ -226,6 +267,8 @@ void DockPanelPositioner::updatePosition()
         break;
     }
 
+    qWarning() << "DockPanelPositioner::updatePosition result - x:" << xPosition << "y:" << yPosition;
+    
     setX(xPosition);
     setY(yPosition);
 }
diff --git a/panels/dock/taskmanager/package/AppItem.qml b/panels/dock/taskmanager/package/AppItem.qml
@@ -306,6 +306,15 @@ Item {
             if (!drag.active) {
                 Panel.contextDragging = false
                 root.dragFinished()
+                // 确保拖拽结束时关闭回收站提示
+                if (root.itemId === "dde-trash") {
+                    console.warn("MouseArea drag.onActiveChanged: drag finished, closing dragToolTip for trash")
+                    isDragOver = false
+                    shouldShowTooltip = false
+                    tooltipVisible = false
+                    tooltipDelayTimer.stop()
+                    dragToolTip.close()
+                }
                 return
             }
             Panel.contextDragging = true
@@ -409,24 +418,103 @@ Item {
     DropArea {
         anchors.fill: parent
         keys: ["dfm_app_type_for_drag"]
+        
+        property bool isDragOver: false
+        property var lastDragPosition: Qt.point(0, 0)
+        property int dragStableThreshold: 5 // 像素阈值，小于这个距离的移动不重新计算位置
+        property bool shouldShowTooltip: false
+        property int lastEnterTime: 0
+        property int lastExitTime: 0
+        property int debounceThreshold: 50 // 50ms防抖阈值，更严格的防抖
+        property bool tooltipVisible: false
 
         onEntered: function (drag) {
+            var currentTime = Date.now()
+            console.warn("AppItem DropArea onEntered:", root.itemId, "drag entered at time", currentTime, "last exit:", lastExitTime, "diff:", currentTime - lastExitTime)
+            
+            // 如果距离上次退出时间太短，忽略这次进入事件
+            if (currentTime - lastExitTime < debounceThreshold) {
+                console.warn("AppItem DropArea onEntered: ignoring rapid enter event, too soon after exit")
+                return
+            }
+            
             if (root.itemId === "dde-trash") {
-                var point = root.mapToItem(null, root.width / 2, root.height / 2)
-                dragToolTip.DockPanelPositioner.bounding = Qt.rect(point.x, point.y, dragToolTip.width, dragToolTip.height)
-                dragToolTip.open()
+                isDragOver = true
+                lastDragPosition = Qt.point(drag.x, drag.y)
+                lastEnterTime = currentTime
+                shouldShowTooltip = true
+                // 如果提示已经显示，不再重新显示
+                if (!tooltipVisible) {
+                    // 使用定时器延迟显示，避免快速切换
+                    tooltipDelayTimer.start()
+                }
             }
         }
 
         onExited: function (drag) {
+            var currentTime = Date.now()
+            console.warn("AppItem DropArea onExited:", root.itemId, "drag exited at time", currentTime, "last enter:", lastEnterTime, "diff:", currentTime - lastEnterTime)
+            
+            // 如果距离上次进入时间太短，忽略这次退出事件
+            if (currentTime - lastEnterTime < debounceThreshold) {
+                console.warn("AppItem DropArea onExited: ignoring rapid exit event, too soon after enter")
+                return
+            }
+            
             if (root.itemId === "dde-trash") {
+                isDragOver = false
+                lastExitTime = currentTime
+                shouldShowTooltip = false
+                tooltipVisible = false
+                tooltipDelayTimer.stop()
+                console.warn("AppItem DropArea onExited: closing dragToolTip for trash")
                 dragToolTip.close()
             }
         }
+        
+        onPositionChanged: function (drag) {
+            if (root.itemId === "dde-trash" && isDragOver && drag) {
+                var currentPos = Qt.point(drag.x, drag.y)
+                var distance = Math.sqrt(Math.pow(currentPos.x - lastDragPosition.x, 2) + Math.pow(currentPos.y - lastDragPosition.y, 2))
+                
+                console.warn("AppItem DropArea onPositionChanged: drag moved", distance, "pixels, threshold:", dragStableThreshold)
+                
+                // 只有当移动距离超过阈值时才更新提示位置
+                if (distance > dragStableThreshold) {
+                    lastDragPosition = currentPos
+                    var point = root.mapToItem(null, root.width / 2, root.height / 2)
+                    console.warn("AppItem DropArea onPositionChanged: updating dragToolTip position to", point.x, point.y)
+                    dragToolTip.DockPanelPositioner.bounding = Qt.rect(point.x, point.y, dragToolTip.width, dragToolTip.height)
+                }
+            }
+        }
 
         onDropped: function (drop){
+            console.warn("AppItem DropArea onDropped: files dropped on", root.itemId)
+            if (root.itemId === "dde-trash") {
+                isDragOver = false
+                shouldShowTooltip = false
+                tooltipVisible = false
+                tooltipDelayTimer.stop()
+                dragToolTip.close()
+                console.warn("AppItem DropArea onDropped: closing dragToolTip for trash after drop")
+            }
             root.dropFilesOnItem(root.itemId, drop.urls)
         }
+
+        Timer {
+            id: tooltipDelayTimer
+            interval: 50 // 50ms延迟，更快的响应
+            onTriggered: {
+                if (shouldShowTooltip && isDragOver) {
+                    var point = root.mapToItem(null, root.width / 2, root.height / 2)
+                    console.warn("AppItem DropArea tooltipDelayTimer: opening dragToolTip for trash at point", point.x, point.y)
+                    dragToolTip.DockPanelPositioner.bounding = Qt.rect(point.x, point.y, dragToolTip.width, dragToolTip.height)
+                    dragToolTip.open()
+                    tooltipVisible = true
+                }
+            }
+        }
     }
 
     onWindowsChanged: {

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ Item {`
`46`	`46`
`47`	`47`	`function open()`
`48`	`48`	`{`
	`49`	`+ console.warn("PanelToolTip::open called for text:", text)`
`49`	`50`	`if (!toolTipWindow)`
`50`	`51`	`return`
`51`	`52`
`@@ -73,6 +74,7 @@ Item {`
`73`	`74`
`74`	`75`	`function close()`
`75`	`76`	`{`
	`77`	`+ console.warn("PanelToolTip::close called for text:", text)`
`76`	`78`	`if (!toolTipWindow)`
`77`	`79`	`return`
`78`	`80`