osd: suppression fix from cc

Author: bbedward

quickshell/Modules/ControlCenter/Components/DragDropGrid.qml

@@ -593,13 +593,13 @@ Column {
             text: {
                 switch (widgetData.id || "") {
                 case "nightMode":
-                    return "Night Mode"
+                    return I18n.tr("Night Mode")
                 case "darkMode":
-                    return SessionData.isLightMode ? "Light Mode" : "Dark Mode"
+                    return I18n.tr("Dark Mode")
                 case "doNotDisturb":
-                    return "Do Not Disturb"
+                    return I18n.tr("Do Not Disturb")
                 case "idleInhibitor":
-                    return SessionService.idleInhibited ? "Keeping Awake" : "Keep Awake"
+                    return SessionService.idleInhibited ? I18n.tr("Keeping Awake") : I18n.tr("Keep Awake")
                 default:
                     return "Unknown"
                 }
@@ -619,7 +619,7 @@ Column {
                 case "nightMode":
                     return DisplayService.nightModeEnabled || false
                 case "darkMode":
-                    return SessionData.isLightMode
+                    return !SessionData.isLightMode
                 case "doNotDisturb":
                     return SessionData.doNotDisturb || false
                 case "idleInhibitor":
@@ -700,7 +700,7 @@ Column {
                 case "nightMode":
                     return DisplayService.nightModeEnabled || false
                 case "darkMode":
-                    return SessionData.isLightMode
+                    return !SessionData.isLightMode
                 case "doNotDisturb":
                     return SessionData.doNotDisturb || false
                 case "idleInhibitor":

quickshell/Modules/ControlCenter/Widgets/AudioSliderRow.qml

@@ -69,6 +69,15 @@ Row {
         valueOverride: actualVolumePercent
         thumbOutlineColor: Theme.surfaceContainer
         trackColor: root.sliderTrackColor.a > 0 ? root.sliderTrackColor : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
+
+        onIsDraggingChanged: {
+            if (isDragging) {
+                AudioService.suppressOSD = true
+            } else {
+                Qt.callLater(() => { AudioService.suppressOSD = false })
+            }
+        }
+
         onSliderValueChanged: function(newValue) {
             if (defaultSink) {
                 defaultSink.audio.volume = newValue / 100.0

quickshell/Modules/ControlCenter/Widgets/BrightnessSliderRow.qml

@@ -143,6 +143,8 @@ Row {
     }
 
     DankSlider {
+        id: brightnessSlider
+
         anchors.verticalCenter: parent.verticalCenter
         width: parent.width - (Theme.iconSize + Theme.spacingS * 2)
         enabled: DisplayService.brightnessAvailable && targetDeviceName.length > 0
@@ -162,7 +164,7 @@ Row {
             }
             return targetDevice.displayMax || 100
         }
-        value: targetBrightness
+        value: !isDragging ? targetBrightness : value
         showValue: true
         unit: {
             if (!targetDevice) return "%"

quickshell/Modules/DankDash/DankDashPopout.qml

@@ -292,6 +292,7 @@ DankPopout {
                         tabBarItem: tabBar
                         keyForwardTarget: mainContainer
                         targetScreen: root.triggerScreen
+                        parentPopout: root
                     }
 
                     WeatherTab {

quickshell/Modules/DankDash/WallpaperTab.qml

@@ -5,6 +5,7 @@ import QtQuick.Controls
 import QtQuick.Effects
 import QtQuick.Layouts
 import Quickshell
+import Quickshell.Wayland
 import qs.Common
 import qs.Modals.FileBrowser
 import qs.Services
@@ -25,6 +26,7 @@ Item {
     property Item tabBarItem: null
     property int gridIndex: 0
     property Item keyForwardTarget: null
+    property var parentPopout: null
     property int lastPage: 0
     property bool enableAnimation: false
     property string homeDir: StandardPaths.writableLocation(StandardPaths.HomeLocation)
@@ -293,6 +295,12 @@ Item {
         active: false
         asynchronous: true
 
+        onActiveChanged: {
+            if (active && parentPopout) {
+                parentPopout.WlrLayershell.keyboardFocus = WlrKeyboardFocus.None
+            }
+        }
+
         sourceComponent: FileBrowserModal {
             Component.onCompleted: {
                 open()
@@ -318,6 +326,13 @@ Item {
                             }
 
             onDialogClosed: {
+                if (parentPopout) {
+                    if (CompositorService.isHyprland) {
+                        parentPopout.WlrLayershell.keyboardFocus = WlrKeyboardFocus.OnDemand
+                    } else {
+                        parentPopout.WlrLayershell.keyboardFocus = WlrKeyboardFocus.Exclusive
+                    }
+                }
                 Qt.callLater(() => wallpaperBrowserLoader.active = false)
             }
         }

quickshell/Services/AudioService.qml

@@ -412,7 +412,7 @@ Singleton {
         interval: 50
         repeat: false
         onTriggered: {
-            if (!root.suppressOSD && SettingsData.soundsEnabled && SettingsData.soundVolumeChanged) {
+            if (SettingsData.soundsEnabled && SettingsData.soundVolumeChanged) {
                 root.playVolumeChangeSound()
             }
         }