Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-25 05:52:50 -05:00
Code Packages Releases Activity

dankbar: copy high-dpi scrolling logic from DankListView

Browse Source
This commit is contained in:
bbedward
2025-12-29 10:52:33 -05:00
parent 518a5d38aa
commit 60034be06a
2 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
quickshell/Modules/DankBar/DankBarWindow.qml
View File

@@ -708,18 +708,22 @@ PanelWindow {
const deltaY = wheel.angleDelta.y;
const deltaX = wheel.angleDelta.x;
const hasPixelY = wheel.pixelDelta && wheel.pixelDelta.y !== 0;
const hasPixelX = wheel.pixelDelta && wheel.pixelDelta.x !== 0;
const xBehavior = barConfig?.scrollXBehavior ?? "column";
const yBehavior = barConfig?.scrollYBehavior ?? "workspace";
if (CompositorService.isNiri && xBehavior !== "none" && Math.abs(deltaX) > Math.abs(deltaY)) {
const isMouseWheel = Math.abs(deltaX) >= 120 && (Math.abs(deltaX) % 120) === 0;
const isTraditionalMouse = !hasPixelX && Math.abs(deltaX) >= 120 && (Math.abs(deltaX) % 120) === 0;
const isHighDpiMouse = !hasPixelX && !isTraditionalMouse && deltaX !== 0;
const reverse = SettingsData.reverseScrolling ? -1 : 1;
const direction = deltaX * reverse < 0 ? 1 : -1;
if (isMouseWheel) {
if (isTraditionalMouse || isHighDpiMouse) {
if (handleScrollAction(xBehavior, direction)) {
actionInProgress = true;
cooldownTimer.restart();
scrollAccumulatorX = 0;
}
} else {
scrollAccumulatorX += deltaX;
@@ -741,14 +745,16 @@ PanelWindow {
return;
}
const isMouseWheel = Math.abs(deltaY) >= 120 && (Math.abs(deltaY) % 120) === 0;
const isTraditionalMouse = !hasPixelY && Math.abs(deltaY) >= 120 && (Math.abs(deltaY) % 120) === 0;
const isHighDpiMouse = !hasPixelY && !isTraditionalMouse && deltaY !== 0;
const reverse = SettingsData.reverseScrolling ? -1 : 1;
const direction = deltaY * reverse < 0 ? 1 : -1;
if (isMouseWheel) {
if (isTraditionalMouse || isHighDpiMouse) {
if (handleScrollAction(yBehavior, direction)) {
actionInProgress = true;
cooldownTimer.restart();
scrollAccumulatorY = 0;
}
} else {
scrollAccumulatorY += deltaY;