From 508f8be6b837e36a72be734bfb388e8bf2ff501a Mon Sep 17 00:00:00 2001 From: Ly-sec Date: Tue, 11 Nov 2025 15:27:17 +0100 Subject: [PATCH] Revert "AudioCard/Panel: add one-shot timer to prevent 100% volume on startup" This reverts commit bd0ddda7c67ce1f90cd8a4a7fd4475a39db1ae75. --- Modules/Panels/Audio/AudioPanel.qml | 38 ++++--------------- .../Panels/ControlCenter/Cards/AudioCard.qml | 38 ++++--------------- 2 files changed, 14 insertions(+), 62 deletions(-) diff --git a/Modules/Panels/Audio/AudioPanel.qml b/Modules/Panels/Audio/AudioPanel.qml index a8e47493..6d857791 100644 --- a/Modules/Panels/Audio/AudioPanel.qml +++ b/Modules/Panels/Audio/AudioPanel.qml @@ -39,23 +39,15 @@ SmartPanel { } } - // Debounce timers to avoid forcing PipeWire volume on startup + // Timer to debounce volume changes Timer { - id: outputDebounceTimer interval: 100 - repeat: false + running: true + repeat: true onTriggered: { if (Math.abs(localOutputVolume - AudioService.volume) >= 0.01) { AudioService.setVolume(localOutputVolume) } - } - } - - Timer { - id: inputDebounceTimer - interval: 100 - repeat: false - onTriggered: { if (Math.abs(localInputVolume - AudioService.inputVolume) >= 0.01) { AudioService.setInputVolume(localInputVolume) } @@ -172,16 +164,8 @@ SmartPanel { value: localOutputVolume stepSize: 0.01 heightRatio: 0.5 - onMoved: value => { - localOutputVolume = value - outputDebounceTimer.restart() - } - onPressedChanged: (pressed, value) => { - localOutputVolumeChanging = pressed - if (!pressed) { - outputDebounceTimer.restart() - } - } + onMoved: value => localOutputVolume = value + onPressedChanged: (pressed, value) => localOutputVolumeChanging = pressed text: Math.round(localOutputVolume * 100) + "%" Layout.bottomMargin: Style.marginM } @@ -237,16 +221,8 @@ SmartPanel { value: localInputVolume stepSize: 0.01 heightRatio: 0.5 - onMoved: value => { - localInputVolume = value - inputDebounceTimer.restart() - } - onPressedChanged: (pressed, value) => { - localInputVolumeChanging = pressed - if (!pressed) { - inputDebounceTimer.restart() - } - } + onMoved: value => localInputVolume = value + onPressedChanged: (pressed, value) => localInputVolumeChanging = pressed text: Math.round(localInputVolume * 100) + "%" Layout.bottomMargin: Style.marginM } diff --git a/Modules/Panels/ControlCenter/Cards/AudioCard.qml b/Modules/Panels/ControlCenter/Cards/AudioCard.qml index dfd90eaf..47c35711 100644 --- a/Modules/Panels/ControlCenter/Cards/AudioCard.qml +++ b/Modules/Panels/ControlCenter/Cards/AudioCard.qml @@ -15,23 +15,15 @@ NBox { property real localInputVolume: AudioService.inputVolume || 0 property bool localInputVolumeChanging: false - // Debounce timers to avoid spamming PipeWire on startup/idle + // Timer to debounce volume changes Timer { - id: outputDebounceTimer interval: 100 - repeat: false + running: true + repeat: true onTriggered: { if (Math.abs(localOutputVolume - AudioService.volume) >= 0.01) { AudioService.setVolume(localOutputVolume) } - } - } - - Timer { - id: inputDebounceTimer - interval: 100 - repeat: false - onTriggered: { if (Math.abs(localInputVolume - AudioService.inputVolume) >= 0.01) { AudioService.setInputVolume(localInputVolume) } @@ -107,16 +99,8 @@ NBox { value: localOutputVolume stepSize: 0.01 heightRatio: 0.5 - onMoved: { - localOutputVolume = value - outputDebounceTimer.restart() - } - onPressedChanged: { - localOutputVolumeChanging = pressed - if (!pressed) { - outputDebounceTimer.restart() - } - } + onMoved: localOutputVolume = value + onPressedChanged: localOutputVolumeChanging = pressed tooltipText: `${Math.round(localOutputVolume * 100)}%` tooltipDirection: "bottom" } @@ -163,16 +147,8 @@ NBox { value: localInputVolume stepSize: 0.01 heightRatio: 0.5 - onMoved: { - localInputVolume = value - inputDebounceTimer.restart() - } - onPressedChanged: { - localInputVolumeChanging = pressed - if (!pressed) { - inputDebounceTimer.restart() - } - } + onMoved: localInputVolume = value + onPressedChanged: localInputVolumeChanging = pressed tooltipText: `${Math.round(localInputVolume * 100)}%` tooltipDirection: "bottom" }