mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-29 07:52:50 -05:00
osd: suppression fix from cc
This commit is contained in:
@@ -593,13 +593,13 @@ Column {
|
|||||||
text: {
|
text: {
|
||||||
switch (widgetData.id || "") {
|
switch (widgetData.id || "") {
|
||||||
case "nightMode":
|
case "nightMode":
|
||||||
return "Night Mode"
|
return I18n.tr("Night Mode")
|
||||||
case "darkMode":
|
case "darkMode":
|
||||||
return SessionData.isLightMode ? "Light Mode" : "Dark Mode"
|
return I18n.tr("Dark Mode")
|
||||||
case "doNotDisturb":
|
case "doNotDisturb":
|
||||||
return "Do Not Disturb"
|
return I18n.tr("Do Not Disturb")
|
||||||
case "idleInhibitor":
|
case "idleInhibitor":
|
||||||
return SessionService.idleInhibited ? "Keeping Awake" : "Keep Awake"
|
return SessionService.idleInhibited ? I18n.tr("Keeping Awake") : I18n.tr("Keep Awake")
|
||||||
default:
|
default:
|
||||||
return "Unknown"
|
return "Unknown"
|
||||||
}
|
}
|
||||||
@@ -619,7 +619,7 @@ Column {
|
|||||||
case "nightMode":
|
case "nightMode":
|
||||||
return DisplayService.nightModeEnabled || false
|
return DisplayService.nightModeEnabled || false
|
||||||
case "darkMode":
|
case "darkMode":
|
||||||
return SessionData.isLightMode
|
return !SessionData.isLightMode
|
||||||
case "doNotDisturb":
|
case "doNotDisturb":
|
||||||
return SessionData.doNotDisturb || false
|
return SessionData.doNotDisturb || false
|
||||||
case "idleInhibitor":
|
case "idleInhibitor":
|
||||||
@@ -700,7 +700,7 @@ Column {
|
|||||||
case "nightMode":
|
case "nightMode":
|
||||||
return DisplayService.nightModeEnabled || false
|
return DisplayService.nightModeEnabled || false
|
||||||
case "darkMode":
|
case "darkMode":
|
||||||
return SessionData.isLightMode
|
return !SessionData.isLightMode
|
||||||
case "doNotDisturb":
|
case "doNotDisturb":
|
||||||
return SessionData.doNotDisturb || false
|
return SessionData.doNotDisturb || false
|
||||||
case "idleInhibitor":
|
case "idleInhibitor":
|
||||||
|
|||||||
@@ -69,6 +69,15 @@ Row {
|
|||||||
valueOverride: actualVolumePercent
|
valueOverride: actualVolumePercent
|
||||||
thumbOutlineColor: Theme.surfaceContainer
|
thumbOutlineColor: Theme.surfaceContainer
|
||||||
trackColor: root.sliderTrackColor.a > 0 ? root.sliderTrackColor : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)
|
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) {
|
onSliderValueChanged: function(newValue) {
|
||||||
if (defaultSink) {
|
if (defaultSink) {
|
||||||
defaultSink.audio.volume = newValue / 100.0
|
defaultSink.audio.volume = newValue / 100.0
|
||||||
|
|||||||
@@ -143,6 +143,8 @@ Row {
|
|||||||
}
|
}
|
||||||
|
|
||||||
DankSlider {
|
DankSlider {
|
||||||
|
id: brightnessSlider
|
||||||
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
width: parent.width - (Theme.iconSize + Theme.spacingS * 2)
|
width: parent.width - (Theme.iconSize + Theme.spacingS * 2)
|
||||||
enabled: DisplayService.brightnessAvailable && targetDeviceName.length > 0
|
enabled: DisplayService.brightnessAvailable && targetDeviceName.length > 0
|
||||||
@@ -162,7 +164,7 @@ Row {
|
|||||||
}
|
}
|
||||||
return targetDevice.displayMax || 100
|
return targetDevice.displayMax || 100
|
||||||
}
|
}
|
||||||
value: targetBrightness
|
value: !isDragging ? targetBrightness : value
|
||||||
showValue: true
|
showValue: true
|
||||||
unit: {
|
unit: {
|
||||||
if (!targetDevice) return "%"
|
if (!targetDevice) return "%"
|
||||||
|
|||||||
@@ -292,6 +292,7 @@ DankPopout {
|
|||||||
tabBarItem: tabBar
|
tabBarItem: tabBar
|
||||||
keyForwardTarget: mainContainer
|
keyForwardTarget: mainContainer
|
||||||
targetScreen: root.triggerScreen
|
targetScreen: root.triggerScreen
|
||||||
|
parentPopout: root
|
||||||
}
|
}
|
||||||
|
|
||||||
WeatherTab {
|
WeatherTab {
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import QtQuick.Controls
|
|||||||
import QtQuick.Effects
|
import QtQuick.Effects
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import Quickshell
|
import Quickshell
|
||||||
|
import Quickshell.Wayland
|
||||||
import qs.Common
|
import qs.Common
|
||||||
import qs.Modals.FileBrowser
|
import qs.Modals.FileBrowser
|
||||||
import qs.Services
|
import qs.Services
|
||||||
@@ -25,6 +26,7 @@ Item {
|
|||||||
property Item tabBarItem: null
|
property Item tabBarItem: null
|
||||||
property int gridIndex: 0
|
property int gridIndex: 0
|
||||||
property Item keyForwardTarget: null
|
property Item keyForwardTarget: null
|
||||||
|
property var parentPopout: null
|
||||||
property int lastPage: 0
|
property int lastPage: 0
|
||||||
property bool enableAnimation: false
|
property bool enableAnimation: false
|
||||||
property string homeDir: StandardPaths.writableLocation(StandardPaths.HomeLocation)
|
property string homeDir: StandardPaths.writableLocation(StandardPaths.HomeLocation)
|
||||||
@@ -293,6 +295,12 @@ Item {
|
|||||||
active: false
|
active: false
|
||||||
asynchronous: true
|
asynchronous: true
|
||||||
|
|
||||||
|
onActiveChanged: {
|
||||||
|
if (active && parentPopout) {
|
||||||
|
parentPopout.WlrLayershell.keyboardFocus = WlrKeyboardFocus.None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sourceComponent: FileBrowserModal {
|
sourceComponent: FileBrowserModal {
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
open()
|
open()
|
||||||
@@ -318,6 +326,13 @@ Item {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onDialogClosed: {
|
onDialogClosed: {
|
||||||
|
if (parentPopout) {
|
||||||
|
if (CompositorService.isHyprland) {
|
||||||
|
parentPopout.WlrLayershell.keyboardFocus = WlrKeyboardFocus.OnDemand
|
||||||
|
} else {
|
||||||
|
parentPopout.WlrLayershell.keyboardFocus = WlrKeyboardFocus.Exclusive
|
||||||
|
}
|
||||||
|
}
|
||||||
Qt.callLater(() => wallpaperBrowserLoader.active = false)
|
Qt.callLater(() => wallpaperBrowserLoader.active = false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -412,7 +412,7 @@ Singleton {
|
|||||||
interval: 50
|
interval: 50
|
||||||
repeat: false
|
repeat: false
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
if (!root.suppressOSD && SettingsData.soundsEnabled && SettingsData.soundVolumeChanged) {
|
if (SettingsData.soundsEnabled && SettingsData.soundVolumeChanged) {
|
||||||
root.playVolumeChangeSound()
|
root.playVolumeChangeSound()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user