diff --git a/quickshell/Modules/DankBar/Widgets/Media.qml b/quickshell/Modules/DankBar/Widgets/Media.qml index 617f837c..8d9b20b5 100644 --- a/quickshell/Modules/DankBar/Widgets/Media.qml +++ b/quickshell/Modules/DankBar/Widgets/Media.qml @@ -49,15 +49,12 @@ BasePill { } onWheel: function (wheelEvent) { - if (!activePlayer) { - wheelEvent.accepted = false; - return; - } - wheelEvent.accepted = true; + if (!usePlayerVolume) + return; const delta = wheelEvent.angleDelta.y; - const currentVolume = usePlayerVolume ? (activePlayer.volume * 100) : ((AudioService.sink?.audio?.volume ?? 0) * 100); + const currentVolume = activePlayer.volume * 100; let newVolume; if (delta > 0) { @@ -66,11 +63,7 @@ BasePill { newVolume = Math.max(0, currentVolume - 5); } - if (usePlayerVolume) { - activePlayer.volume = newVolume / 100; - } else if (AudioService.sink?.audio) { - AudioService.sink.audio.volume = newVolume / 100; - } + activePlayer.volume = newVolume / 100; } content: Component { diff --git a/quickshell/Modules/Greetd/GreeterContent.qml b/quickshell/Modules/Greetd/GreeterContent.qml index 9541bb1a..fb2be8a7 100644 --- a/quickshell/Modules/Greetd/GreeterContent.qml +++ b/quickshell/Modules/Greetd/GreeterContent.qml @@ -157,6 +157,8 @@ Item { anchors.fill: parent screenName: root.screenName visible: { + var _ = SessionData.perMonitorWallpaper + var __ = SessionData.monitorWallpapers var currentWallpaper = SessionData.getMonitorWallpaper(screenName) return !currentWallpaper || currentWallpaper === "" || (currentWallpaper && currentWallpaper.startsWith("#")) } @@ -167,6 +169,8 @@ Item { anchors.fill: parent source: { + var _ = SessionData.perMonitorWallpaper + var __ = SessionData.monitorWallpapers var currentWallpaper = SessionData.getMonitorWallpaper(screenName) return (currentWallpaper && !currentWallpaper.startsWith("#")) ? currentWallpaper : "" }