Skip to content

fix: plugin docked into tray area #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yixinshark merged 1 commit into from
Jan 7, 2025
Merged

fix: plugin docked into tray area #1007

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions panels/dock/tray/package/TrayContainer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,15 @@ Item {
id: dropArea
anchors.fill: parent
keys: ["text/x-dde-shell-tray-dnd-surfaceId"]
property bool isDropped: false
property bool dragExited: false
property string source: ""
property string surfaceId: ""
Copy link
Contributor

@18202781743 18202781743 Jan 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这几个变量的值，是不是需要在拖拽完成后重置下，

Copy link
Contributor Author

@yixinshark yixinshark Jan 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

拖拽的时候，先触发的onEnter，会初始化这些值

onEntered: function (dragEvent) {
let surfaceId = dragEvent.getDataAsString("text/x-dde-shell-tray-dnd-surfaceId")
let source = dragEvent.getDataAsString("text/x-dde-shell-tray-dnd-source")
dragExited = false
isDropped = false
surfaceId = dragEvent.getDataAsString("text/x-dde-shell-tray-dnd-surfaceId")
source = dragEvent.getDataAsString("text/x-dde-shell-tray-dnd-source")
console.log(surfaceId, source)
if (source !== "" && DDT.TraySortOrderModel.isDisplayedSurface(surfaceId)) {
dragEvent.accepted = false
Expand All @@ -164,6 +170,7 @@ Item {
if (!isStash) {
if (dropHoverIndex !== 0) {
dropTrayTimer.handleDrop = function() {
if (isDropped || dragExited) return
DDT.TraySortOrderModel.dropToDockTray(surfaceId, Math.floor(currentItemIndex), isBefore)
}
dropTrayTimer.start()
Expand All @@ -173,6 +180,7 @@ Item {
}
}
onDropped: function (dropEvent) {
isDropped = true
let surfaceId = dropEvent.getDataAsString("text/x-dde-shell-tray-dnd-surfaceId")
let dropIdx = DDT.TrayItemPositionManager.itemIndexByPoint(Qt.point(drag.x, drag.y))
let currentItemIndex = dropIdx.index
Expand All @@ -182,6 +190,15 @@ Item {
DDT.TraySortOrderModel.actionsAlwaysVisible = false
}

onExited: function () {
dragExited = true
// dragging from quickPanel, entered trayContainer, but not dropped in this area
if (source !== "" && !isDropped) {
dropTrayTimer.stop()
DDT.TraySortOrderModel.setSurfaceVisible(surfaceId, false)
}
}

Timer {
id: dropTrayTimer
interval: 50
Expand Down
Loading