diff --git a/quickshell/Modules/DankBar/DankBarWindow.qml b/quickshell/Modules/DankBar/DankBarWindow.qml index 5b70ba40b..3b9901485 100644 --- a/quickshell/Modules/DankBar/DankBarWindow.qml +++ b/quickshell/Modules/DankBar/DankBarWindow.qml @@ -1158,9 +1158,9 @@ PanelWindow { if (!CompositorService.isNiri) return false; if (direction > 0) - NiriService.moveColumnRight(); + NiriService.moveColumnRight(barWindow.screenName); else - NiriService.moveColumnLeft(); + NiriService.moveColumnLeft(barWindow.screenName); return true; default: return false; diff --git a/quickshell/Services/NiriService.qml b/quickshell/Services/NiriService.qml index af31c3633..fc52e6a58 100644 --- a/quickshell/Services/NiriService.qml +++ b/quickshell/Services/NiriService.qml @@ -741,7 +741,19 @@ Singleton { }); } - function moveColumnLeft() { + function focusMonitor(outputName) { + return send({ + "Action": { + "FocusMonitor": { + "output": outputName + } + } + }); + } + + function moveColumnLeft(outputName) { + if (outputName && outputName !== currentOutput) + focusMonitor(outputName); return send({ "Action": { "FocusColumnLeft": {} @@ -749,7 +761,9 @@ Singleton { }); } - function moveColumnRight() { + function moveColumnRight(outputName) { + if (outputName && outputName !== currentOutput) + focusMonitor(outputName); return send({ "Action": { "FocusColumnRight": {}