lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Dock: make drag&drop much nicer

Browse Source
This commit is contained in:
Lysec
2026-01-23 13:31:32 +01:00
parent 9f8d3c0df6
commit 4e98dc96a4
1 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Dock/Dock.qml
+72 -2
View File
@@ -106,6 +106,10 @@ Loader {
// Track the session order of apps (transient reordering)
property var sessionAppOrder: []
// Drag and Drop state for visual feedback
property int dragSourceIndex: -1
property int dragTargetIndex: -1
// Revision counter to force icon re-evaluation
property int iconRevision: 0
@@ -636,7 +640,19 @@ Loader {
DropArea {
anchors.fill: parent
keys: ["dock-app"]
onEntered: function (drag) {
if (drag.source && drag.source.objectName === "dockAppButton") {
root.dragTargetIndex = appButton.modelIndex;
}
}
onExited: function () {
if (root.dragTargetIndex === appButton.modelIndex) {
root.dragTargetIndex = -1;
}
}
onDropped: function (drop) {
root.dragSourceIndex = -1;
root.dragTargetIndex = -1;
if (drop.source && drop.source.objectName === "dockAppButton" && drop.source !== appButton) {
root.reorderApps(drop.source.modelIndex, appButton.modelIndex);
}
@@ -661,6 +677,19 @@ Loader {
anchors.centerIn: dragging ? undefined : parent
property bool dragging: appMouseArea.drag.active
onDraggingChanged: {
if (dragging) {
root.dragSourceIndex = index;
} else {
// Reset if not handled by drop (e.g. dropped outside)
Qt.callLater(() => {
if (!appMouseArea.drag.active && root.dragSourceIndex === index) {
root.dragSourceIndex = -1;
root.dragTargetIndex = -1;
}
});
}
}
Drag.active: dragging
Drag.source: appButton
@@ -668,7 +697,7 @@ Loader {
Drag.hotSpot.y: height / 2
Drag.keys: ["dock-app"]
z: dragging ? 1000 : 0
z: (root.dragSourceIndex === index) ? 1000 : ((dragging ? 1000 : 0))
scale: dragging ? 1.1 : (appButton.hovered ? 1.15 : 1.0)
Behavior on scale {
NumberAnimation {
@@ -678,6 +707,47 @@ Loader {
}
}
// Visual shifting logic
readonly property bool isDragged: root.dragSourceIndex === index
property real shiftOffset: 0
Binding on shiftOffset {
value: {
if (root.dragSourceIndex !== -1 && root.dragTargetIndex !== -1 && !iconContainer.isDragged) {
if (root.dragSourceIndex < root.dragTargetIndex) {
// Dragging Forward: Items between source and target shift Backward
if (index > root.dragSourceIndex && index <= root.dragTargetIndex) {
return -1 * (root.isVertical ? iconSize + Style.marginS : iconSize + Style.marginS);
}
} else if (root.dragSourceIndex > root.dragTargetIndex) {
// Dragging Backward: Items between target and source shift Forward
if (index >= root.dragTargetIndex && index < root.dragSourceIndex) {
return (root.isVertical ? iconSize + Style.marginS : iconSize + Style.marginS);
}
}
}
return 0;
}
}
transform: Translate {
x: !root.isVertical ? iconContainer.shiftOffset : 0
y: root.isVertical ? iconContainer.shiftOffset : 0
Behavior on x {
NumberAnimation {
duration: Style.animationFast
easing.type: Easing.OutQuad
}
}
Behavior on y {
NumberAnimation {
duration: Style.animationFast
easing.type: Easing.OutQuad
}
}
}
IconImage {
id: appIcon
anchors.fill: parent
@@ -779,7 +849,7 @@ Loader {
// Only allow left-click dragging via axis control
drag.target: iconContainer
drag.axis: (pressedButtons & Qt.LeftButton) ? Drag.XAndYAxis : Drag.None
drag.axis: (pressedButtons & Qt.LeftButton) ? (root.isVertical ? Drag.YAxis : Drag.XAxis) : Drag.None
preventStealing: true
onPressed: {