From e556acf2e41f2f75e2dd8d1fbc4e1240048991d2 Mon Sep 17 00:00:00 2001 From: Wang Zichong Date: Mon, 23 Dec 2024 13:05:25 +0800 Subject: [PATCH] fix: drag offset on dock taskmanager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复拖拽任务栏上的应用图标时，图标拖拽位置和实际位置可能错位的问题。 PMS: BUG-296961 Log: --- panels/dock/taskmanager/package/TaskManager.qml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/panels/dock/taskmanager/package/TaskManager.qml b/panels/dock/taskmanager/package/TaskManager.qml index 53a464569..21680d71d 100644 --- a/panels/dock/taskmanager/package/TaskManager.qml +++ b/panels/dock/taskmanager/package/TaskManager.qml @@ -48,6 +48,8 @@ ContainmentItem { model: DelegateModel { id: visualModel model: taskmanager.Applet.dataModel + // 1:4 the distance between app : dock height; get width/height≈0.8 + property real cellWidth: Panel.rootObject.dockItemMaxSize * 0.8 delegate: DropArea { id: delegateRoot required property bool active @@ -78,9 +80,8 @@ ContainmentItem { Behavior on scale { NumberAnimation { duration: 200 } } // TODO: 临时溢出逻辑，待后面修改 - // 1:4 the distance between app : dock height; get width/height≈0.8 - implicitWidth: useColumnLayout ? Panel.rootObject.dockItemMaxSize : Panel.rootObject.dockItemMaxSize * 0.8 - implicitHeight: useColumnLayout ? Panel.rootObject.dockItemMaxSize * 0.8 : Panel.rootObject.dockItemMaxSize + implicitWidth: useColumnLayout ? Panel.rootObject.dockItemMaxSize : visualModel.cellWidth + implicitHeight: useColumnLayout ? visualModel.cellWidth : Panel.rootObject.dockItemMaxSize onEntered: function(drag) { visualModel.items.move((drag.source as AppItem).visualIndex, app.visualIndex) @@ -136,8 +137,7 @@ ContainmentItem { onPositionChanged: function(drag) { if (launcherDndDesktopId === "") return let curX = taskmanager.useColumnLayout ? drag.y : drag.x - curX *= Screen.devicePixelRatio - let cellWidth = Panel.rootObject.dockItemMaxSize + let cellWidth = visualModel.cellWidth let curCell = curX / cellWidth let appId = taskmanager.Applet.desktopIdToAppId(launcherDndDesktopId) taskmanager.Applet.dataModel.moveTo(appId, curCell) @@ -146,8 +146,7 @@ ContainmentItem { onDropped: function(drop) { if (launcherDndDesktopId === "") return let curX = taskmanager.useColumnLayout ? drop.y : drop.x - curX *= Screen.devicePixelRatio - let cellWidth = Panel.rootObject.dockItemMaxSize + let cellWidth = visualModel.cellWidth let curCell = curX / cellWidth let appId = taskmanager.Applet.desktopIdToAppId(launcherDndDesktopId) taskmanager.Applet.dataModel.moveTo(appId, curCell)