Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-16 02:32:09 -04:00
Code Packages Releases Activity

dock: improve pinned app re-ordering feedback, fix vertical dock

Browse Source 
ordering
fixes #1046
fixes #938
This commit is contained in:
bbedward
2025-12-15 20:46:36 -05:00
parent 60b5e47836
commit 0bece5287e
2 changed files with 343 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
quickshell/Modules/Dock/DockAppButton.qml
View File

@@ -19,9 +19,10 @@ Item {
property bool longPressing: false
property bool dragging: false
property point dragStartPos: Qt.point(0, 0)
property point dragOffset: Qt.point(0, 0)
property real dragAxisOffset: 0
property int targetIndex: -1
property int originalIndex: -1
property bool isVertical: SettingsData.dockPosition === SettingsData.Position.Left || SettingsData.dockPosition === SettingsData.Position.Right
property bool showWindowTitle: false
property string windowTitle: ""
property bool isHovered: mouseArea.containsMouse && !dragging
@@ -95,7 +96,7 @@ Item {
return appData?.allWindows?.map(w => w.toplevel).filter(t => t !== null) || [];
}
onIsHoveredChanged: {
if (mouseArea.pressed)
if (mouseArea.pressed || dragging)
return;
if (isHovered) {
exitAnimation.stop();
@@ -128,8 +129,8 @@ Item {
running: false
NumberAnimation {
target: iconTransform
property: animateX ? "x" : "y"
target: root
property: "hoverAnimOffset"
to: animationDirection * animationDistance * 0.25
duration: Anims.durShort
easing.type: Easing.BezierSpline
@@ -137,8 +138,8 @@ Item {
}
NumberAnimation {
target: iconTransform
property: animateX ? "x" : "y"
target: root
property: "hoverAnimOffset"
to: animationDirection * animationDistance * 0.2
duration: Anims.durShort
easing.type: Easing.BezierSpline
@@ -150,8 +151,8 @@ Item {
id: exitAnimation
running: false
target: iconTransform
property: animateX ? "x" : "y"
target: root
property: "hoverAnimOffset"
to: 0
duration: Anims.durShort
easing.type: Easing.BezierSpline
@@ -187,16 +188,79 @@ Item {
}
onReleased: mouse => {
longPressTimer.stop();
if (longPressing) {
if (dragging && targetIndex >= 0 && targetIndex !== originalIndex && dockApps) {
const wasDragging = dragging;
const didReorder = wasDragging && targetIndex >= 0 && targetIndex !== originalIndex && dockApps;
if (didReorder)
dockApps.movePinnedApp(originalIndex, targetIndex);
}
longPressing = false;
dragging = false;
dragOffset = Qt.point(0, 0);
dragAxisOffset = 0;
targetIndex = -1;
originalIndex = -1;
if (dockApps && !didReorder) {
dockApps.draggedIndex = -1;
dockApps.dropTargetIndex = -1;
}
if (wasDragging || mouse.button !== Qt.LeftButton)
return;
handleLeftClick();
}
function handleLeftClick() {
if (!appData)
return;
switch (appData.type) {
case "pinned":
if (!appData.appId)
return;
const pinnedEntry = cachedDesktopEntry;
if (pinnedEntry) {
AppUsageHistoryData.addAppUsage({
"id": appData.appId,
"name": pinnedEntry.name || appData.appId,
"icon": pinnedEntry.icon || "",
"exec": pinnedEntry.exec || "",
"comment": pinnedEntry.comment || ""
});
}
SessionService.launchDesktopEntry(pinnedEntry);
break;
case "window":
const windowToplevel = getToplevelObject();
if (windowToplevel)
windowToplevel.activate();
break;
case "grouped":
if (appData.windowCount === 0) {
if (!appData.appId)
return;
const groupedEntry = cachedDesktopEntry;
if (groupedEntry) {
AppUsageHistoryData.addAppUsage({
"id": appData.appId,
"name": groupedEntry.name || appData.appId,
"icon": groupedEntry.icon || "",
"exec": groupedEntry.exec || "",
"comment": groupedEntry.comment || ""
});
}
SessionService.launchDesktopEntry(groupedEntry);
} else if (appData.windowCount === 1) {
const groupedToplevel = getToplevelObject();
if (groupedToplevel)
groupedToplevel.activate();
} else if (contextMenu) {
const shouldHidePin = appData.appId === "org.quickshell";
contextMenu.showForButton(root, appData, root.height + 25, shouldHidePin, cachedDesktopEntry, parentDockScreen);
}
break;
}
}
onPositionChanged: mouse => {
@@ -206,90 +270,47 @@ Item {
dragging = true;
targetIndex = index;
originalIndex = index;
}
}
if (dragging) {
dragOffset = Qt.point(mouse.x - dragStartPos.x, mouse.y - dragStartPos.y);
if (dockApps) {
const threshold = actualIconSize;
let newTargetIndex = targetIndex;
if (dragOffset.x > threshold && targetIndex < dockApps.pinnedAppCount - 1) {
newTargetIndex = targetIndex + 1;
} else if (dragOffset.x < -threshold && targetIndex > 0) {
newTargetIndex = targetIndex - 1;
dockApps.draggedIndex = index;
dockApps.dropTargetIndex = index;
}
}
}
if (!dragging || !dockApps)
return;
const axisOffset = isVertical ? (mouse.y - dragStartPos.y) : (mouse.x - dragStartPos.x);
dragAxisOffset = axisOffset;
const spacing = Math.min(8, Math.max(4, actualIconSize * 0.08));
const itemSize = actualIconSize * 1.2 + spacing;
const slotOffset = Math.round(axisOffset / itemSize);
const newTargetIndex = Math.max(0, Math.min(dockApps.pinnedAppCount - 1, originalIndex + slotOffset));
if (newTargetIndex !== targetIndex) {
targetIndex = newTargetIndex;
dragStartPos = Qt.point(mouse.x, mouse.y);
}
}
dockApps.dropTargetIndex = newTargetIndex;
}
}
onClicked: mouse => {
if (!appData || longPressing) {
if (!appData)
return;
}
if (mouse.button === Qt.LeftButton) {
if (appData.type === "pinned") {
if (appData && appData.appId) {
const desktopEntry = cachedDesktopEntry;
if (desktopEntry) {
AppUsageHistoryData.addAppUsage({
"id": appData.appId,
"name": desktopEntry.name || appData.appId,
"icon": desktopEntry.icon || "",
"exec": desktopEntry.exec || "",
"comment": desktopEntry.comment || ""
});
}
SessionService.launchDesktopEntry(desktopEntry);
}
} else if (appData.type === "window") {
const toplevel = getToplevelObject();
if (toplevel) {
toplevel.activate();
}
} else if (appData.type === "grouped") {
if (appData.windowCount === 0) {
if (appData && appData.appId) {
const desktopEntry = cachedDesktopEntry;
if (desktopEntry) {
AppUsageHistoryData.addAppUsage({
"id": appData.appId,
"name": desktopEntry.name || appData.appId,
"icon": desktopEntry.icon || "",
"exec": desktopEntry.exec || "",
"comment": desktopEntry.comment || ""
});
}
SessionService.launchDesktopEntry(desktopEntry);
}
} else if (appData.windowCount === 1) {
// For single window, activate directly
const toplevel = getToplevelObject();
if (toplevel) {
console.log("Activating grouped app window:", appData.windowTitle);
toplevel.activate();
} else {
console.warn("No toplevel found for grouped app");
}
} else {
if (contextMenu) {
const shouldHidePin = appData.appId === "org.quickshell";
contextMenu.showForButton(root, appData, root.height + 25, shouldHidePin, cachedDesktopEntry, parentDockScreen);
}
}
}
} else if (mouse.button === Qt.MiddleButton) {
if (appData?.type === "window") {
appData?.toplevel?.close();
} else if (appData?.type === "grouped") {
if (mouse.button === Qt.MiddleButton) {
switch (appData.type) {
case "window":
appData.toplevel?.close();
break;
case "grouped":
if (contextMenu) {
const shouldHidePin = appData.appId === "org.quickshell";
contextMenu.showForButton(root, appData, root.height, shouldHidePin, cachedDesktopEntry, parentDockScreen);
}
} else if (appData && appData.appId) {
break;
default:
if (!appData.appId)
return;
const desktopEntry = cachedDesktopEntry;
if (desktopEntry) {
AppUsageHistoryData.addAppUsage({
@@ -301,26 +322,39 @@ Item {
});
}
SessionService.launchDesktopEntry(desktopEntry);
break;
}
} else if (mouse.button === Qt.RightButton) {
if (contextMenu && appData) {
if (!contextMenu)
return;
const shouldHidePin = appData.appId === "org.quickshell";
contextMenu.showForButton(root, appData, root.height, shouldHidePin, cachedDesktopEntry, parentDockScreen);
} else {
console.warn("No context menu or appData available");
}
}
}
}
property real hoverAnimOffset: 0
Item {
id: visualContent
anchors.fill: parent
transform: Translate {
id: iconTransform
x: 0
y: 0
x: {
if (dragging && !isVertical)
return dragAxisOffset;
if (!dragging && isVertical)
return hoverAnimOffset;
return 0;
}
y: {
if (dragging && isVertical)
return dragAxisOffset;
if (!dragging && !isVertical)
return hoverAnimOffset;
return 0;
}
}
Rectangle {

146
quickshell/Modules/Dock/DockApps.qml
View File

@@ -1,11 +1,8 @@
import QtQuick
import QtQuick.Controls
import Quickshell
import Quickshell.Wayland
import Quickshell.Hyprland
import qs.Common
import qs.Services
import qs.Widgets
Item {
id: root
@@ -17,6 +14,9 @@ Item {
property bool isVertical: false
property var dockScreen: null
property real iconSize: 40
property int draggedIndex: -1
property int dropTargetIndex: -1
property bool suppressShiftAnimation: false
clip: false
implicitWidth: isVertical ? appLayout.height : appLayout.width
@@ -24,18 +24,18 @@ Item {
function movePinnedApp(fromIndex, toIndex) {
if (fromIndex === toIndex) {
return
return;
}
const currentPinned = [...(SessionData.pinnedApps || [])]
const currentPinned = [...(SessionData.pinnedApps || [])];
if (fromIndex < 0 || fromIndex >= currentPinned.length || toIndex < 0 || toIndex >= currentPinned.length) {
return
return;
}
const movedApp = currentPinned.splice(fromIndex, 1)[0]
currentPinned.splice(toIndex, 0, movedApp)
const movedApp = currentPinned.splice(fromIndex, 1)[0];
currentPinned.splice(toIndex, 0, movedApp);
SessionData.setPinnedApps(currentPinned)
SessionData.setPinnedApps(currentPinned);
}
Item {
@@ -66,44 +66,44 @@ Item {
Component.onCompleted: updateModel()
function updateModel() {
const items = []
const pinnedApps = [...(SessionData.pinnedApps || [])]
const sortedToplevels = CompositorService.sortedToplevels
const items = [];
const pinnedApps = [...(SessionData.pinnedApps || [])];
const sortedToplevels = CompositorService.sortedToplevels;
if (root.groupByApp) {
const appGroups = new Map()
const appGroups = new Map();
pinnedApps.forEach(rawAppId => {
const appId = Paths.moddedAppId(rawAppId)
const appId = Paths.moddedAppId(rawAppId);
appGroups.set(appId, {
appId: appId,
isPinned: true,
windows: []
})
})
});
});
sortedToplevels.forEach((toplevel, index) => {
const rawAppId = toplevel.appId || "unknown"
const appId = Paths.moddedAppId(rawAppId)
const rawAppId = toplevel.appId || "unknown";
const appId = Paths.moddedAppId(rawAppId);
if (!appGroups.has(appId)) {
appGroups.set(appId, {
appId: appId,
isPinned: false,
windows: []
})
});
}
appGroups.get(appId).windows.push({
toplevel: toplevel,
index: index
})
})
});
});
const pinnedGroups = []
const unpinnedGroups = []
const pinnedGroups = [];
const unpinnedGroups = [];
Array.from(appGroups.entries()).forEach(([appId, group]) => {
const firstWindow = group.windows.length > 0 ? group.windows[0] : null
const firstWindow = group.windows.length > 0 ? group.windows[0] : null;
const item = {
uniqueKey: "grouped_" + appId,
@@ -114,16 +114,16 @@ Item {
isRunning: group.windows.length > 0,
windowCount: group.windows.length,
allWindows: group.windows
}
};
if (group.isPinned) {
pinnedGroups.push(item)
pinnedGroups.push(item);
} else {
unpinnedGroups.push(item)
unpinnedGroups.push(item);
}
})
});
pinnedGroups.forEach(item => items.push(item))
pinnedGroups.forEach(item => items.push(item));
if (pinnedGroups.length > 0 && unpinnedGroups.length > 0) {
items.push({
@@ -133,14 +133,14 @@ Item {
toplevel: null,
isPinned: false,
isRunning: false
})
});
}
unpinnedGroups.forEach(item => items.push(item))
root.pinnedAppCount = pinnedGroups.length
unpinnedGroups.forEach(item => items.push(item));
root.pinnedAppCount = pinnedGroups.length;
} else {
pinnedApps.forEach(rawAppId => {
const appId = Paths.moddedAppId(rawAppId)
const appId = Paths.moddedAppId(rawAppId);
items.push({
uniqueKey: "pinned_" + appId,
type: "pinned",
@@ -148,10 +148,10 @@ Item {
toplevel: null,
isPinned: true,
isRunning: false
})
})
});
});
root.pinnedAppCount = pinnedApps.length
root.pinnedAppCount = pinnedApps.length;
if (pinnedApps.length > 0 && sortedToplevels.length > 0) {
items.push({
@@ -161,17 +161,17 @@ Item {
toplevel: null,
isPinned: false,
isRunning: false
})
});
}
sortedToplevels.forEach((toplevel, index) => {
let uniqueKey = "window_" + index
let uniqueKey = "window_" + index;
if (CompositorService.isHyprland && Hyprland.toplevels) {
const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
const hyprlandToplevels = Array.from(Hyprland.toplevels.values);
for (let i = 0; i < hyprlandToplevels.length; i++) {
if (hyprlandToplevels[i].wayland === toplevel) {
uniqueKey = "window_" + hyprlandToplevels[i].address
break
uniqueKey = "window_" + hyprlandToplevels[i].address;
break;
}
}
}
@@ -183,11 +183,11 @@ Item {
toplevel: toplevel,
isPinned: false,
isRunning: true
})
})
});
});
}
dockItems = items
dockItems = items;
}
delegate: Item {
@@ -195,10 +195,52 @@ Item {
property alias dockButton: button
property var itemData: modelData
clip: false
z: button.dragging ? 100 : 0
width: itemData.type === "separator" ? (root.isVertical ? root.iconSize : 8) : (root.isVertical ? root.iconSize : root.iconSize * 1.2)
height: itemData.type === "separator" ? (root.isVertical ? 8 : root.iconSize) : (root.isVertical ? root.iconSize * 1.2 : root.iconSize)
property real shiftOffset: {
if (root.draggedIndex < 0 || !itemData.isPinned || itemData.type === "separator")
return 0;
if (model.index === root.draggedIndex)
return 0;
const dragIdx = root.draggedIndex;
const dropIdx = root.dropTargetIndex;
const myIdx = model.index;
const shiftAmount = root.iconSize * 1.2 + layoutFlow.spacing;
if (dropIdx < 0)
return 0;
if (dragIdx < dropIdx && myIdx > dragIdx && myIdx <= dropIdx)
return -shiftAmount;
if (dragIdx > dropIdx && myIdx >= dropIdx && myIdx < dragIdx)
return shiftAmount;
return 0;
}
transform: Translate {
x: root.isVertical ? 0 : delegateItem.shiftOffset
y: root.isVertical ? delegateItem.shiftOffset : 0
Behavior on x {
enabled: !root.suppressShiftAnimation
NumberAnimation {
duration: 150
easing.type: Easing.OutCubic
}
}
Behavior on y {
enabled: !root.suppressShiftAnimation
NumberAnimation {
duration: 150
easing.type: Easing.OutCubic
}
}
}
Rectangle {
visible: itemData.type === "separator"
width: root.isVertical ? root.iconSize * 0.5 : 2
@@ -225,8 +267,8 @@ Item {
showWindowTitle: itemData?.type === "window" || itemData?.type === "grouped"
windowTitle: {
const title = itemData?.toplevel?.title || "(Unnamed)"
return title.length > 50 ? title.substring(0, 47) + "..." : title
const title = itemData?.toplevel?.title || "(Unnamed)";
return title.length > 50 ? title.substring(0, 47) + "..." : title;
}
}
}
@@ -237,18 +279,24 @@ Item {
Connections {
target: CompositorService
function onToplevelsChanged() {
repeater.updateModel()
repeater.updateModel();
}
}
Connections {
target: SessionData
function onPinnedAppsChanged() {
repeater.updateModel()
root.suppressShiftAnimation = true;
root.draggedIndex = -1;
root.dropTargetIndex = -1;
repeater.updateModel();
Qt.callLater(() => {
root.suppressShiftAnimation = false;
});
}
}
onGroupByAppChanged: {
repeater.updateModel()
repeater.updateModel();
}
}