Skip to content

chore: avoid using cell width to calculate target index for taskbar #1212

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
BLumia merged 1 commit into from
Aug 4, 2025
Merged

chore: avoid using cell width to calculate target index for taskbar #1212

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions panels/dock/OverflowContainer.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ Item {
}
}

function indexAt(x, y) {
return listView.indexAt(x, y)
}

implicitWidth: {
let width = 0
for (let child of listView.contentItem.visibleChildren) {
Expand Down
34 changes: 25 additions & 9 deletions panels/dock/taskmanager/package/TaskManager.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,23 @@ ContainmentItem {
implicitWidth: useColumnLayout ? Panel.rootObject.dockSize : (Math.min(remainingSpacesForTaskManager, appContainer.implicitWidth) + forceRelayoutWorkaround)
implicitHeight: useColumnLayout ? (Math.min(remainingSpacesForTaskManager, appContainer.implicitHeight) + forceRelayoutWorkaround) : Panel.rootObject.dockSize

// Find target index by position using ListView's built-in indexAt method instead of relying on fixed width
function findTargetIndexByPosition(dragPosition) {
if (!appContainer || !appContainer.model || appContainer.model.count === 0) {
return 0
}

// Use ListView's built-in indexAt method
let targetIndex = appContainer.indexAt(dragPosition.x, dragPosition.y)

// If no valid index found, return end position
if (targetIndex === -1) {
return appContainer.model.count
}

return targetIndex
}

OverflowContainer {
id: appContainer
anchors.fill: parent
Expand Down Expand Up @@ -103,7 +120,8 @@ ContainmentItem {
implicitHeight: useColumnLayout ? visualModel.cellWidth : taskmanager.implicitHeight

onEntered: function(drag) {
visualModel.items.move((drag.source as AppItem).visualIndex, app.visualIndex)
// TODO: this is actually unused, should change the delegateRoot type from DropArea to Item later.
visualModel.items.move(drag.source.DelegateModel.itemsIndex, delegateRoot.DelegateModel.itemsIndex)
Comment on lines +123 to +124
Copy link

@sourcery-ai sourcery-ai bot Aug 4, 2025

Choose a reason for hiding this comment

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

suggestion: Remove or address TODO comments in production code.

Consider removing the unused code or opening a tracking issue instead of leaving a TODO.

Suggested change
// TODO: this is actually unused, should change the delegateRoot type from DropArea to Item later.
visualModel.items.move(drag.source.DelegateModel.itemsIndex, delegateRoot.DelegateModel.itemsIndex)
visualModel.items.move(drag.source.DelegateModel.itemsIndex, delegateRoot.DelegateModel.itemsIndex)

}

property int visualIndex: DelegateModel.itemsIndex
Expand Down Expand Up @@ -156,21 +174,19 @@ ContainmentItem {

onPositionChanged: function(drag) {
if (launcherDndDesktopId === "") return
let curX = taskmanager.useColumnLayout ? drag.y : drag.x
let cellWidth = visualModel.cellWidth
let curCell = curX / cellWidth
let dragPosition = Qt.point(drag.x, drag.y)
let targetIndex = taskmanager.findTargetIndexByPosition(dragPosition)
let appId = taskmanager.Applet.desktopIdToAppId(launcherDndDesktopId)
taskmanager.Applet.dataModel.moveTo(appId, curCell)
taskmanager.Applet.dataModel.moveTo(appId, targetIndex)
}

onDropped: function(drop) {
Panel.contextDragging = false
if (launcherDndDesktopId === "") return
let curX = taskmanager.useColumnLayout ? drop.y : drop.x
let cellWidth = visualModel.cellWidth
let curCell = curX / cellWidth
let dropPosition = Qt.point(drop.x, drop.y)
let targetIndex = taskmanager.findTargetIndexByPosition(dropPosition)
let appId = taskmanager.Applet.desktopIdToAppId(launcherDndDesktopId)
taskmanager.Applet.dataModel.moveTo(appId, curCell)
taskmanager.Applet.dataModel.moveTo(appId, targetIndex)
resetDndState()
}

Expand Down