From 15873d48189a613bafa71de0de5ebd9b418b79fc Mon Sep 17 00:00:00 2001 From: ern775 Date: Tue, 7 Apr 2026 22:34:11 +0300 Subject: [PATCH] feat(brightness): change enforce minimum brightness method --- Modules/Cards/BrightnessCard.qml | 2 +- Modules/Panels/Media/MediaPlayerPanel.qml | 2 +- Services/Hardware/BrightnessService.qml | 16 +++++----------- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/Modules/Cards/BrightnessCard.qml b/Modules/Cards/BrightnessCard.qml index 3254db674..2244bd209 100644 --- a/Modules/Cards/BrightnessCard.qml +++ b/Modules/Cards/BrightnessCard.qml @@ -57,7 +57,7 @@ NBox { running: false repeat: false onTriggered: { - if (brightnessMonitor && Math.abs(localBrightness - brightnessMonitor.brightness) >= 0.01) { + if (brightnessMonitor && Math.abs(localBrightness - brightnessMonitor.brightness) > 0.009) { brightnessMonitor.setBrightness(localBrightness); } } diff --git a/Modules/Panels/Media/MediaPlayerPanel.qml b/Modules/Panels/Media/MediaPlayerPanel.qml index 99275a6b5..721ba7b5f 100644 --- a/Modules/Panels/Media/MediaPlayerPanel.qml +++ b/Modules/Panels/Media/MediaPlayerPanel.qml @@ -74,7 +74,7 @@ SmartPanel { id: playerContent anchors.fill: parent - property real contentPreferredHeight: mainLayout.implicitHeight + Style.margin2L; + property real contentPreferredHeight: mainLayout.implicitHeight + Style.margin2L property Component visualizerSource: { switch (root.visualizerType) { diff --git a/Services/Hardware/BrightnessService.qml b/Services/Hardware/BrightnessService.qml index 26847a505..44e40f37e 100644 --- a/Services/Hardware/BrightnessService.qml +++ b/Services/Hardware/BrightnessService.qml @@ -450,7 +450,6 @@ Singleton { } readonly property real stepSize: Settings.data.brightness.brightnessStep / 100.0 - readonly property real minBrightnessValue: (Settings.data.brightness.enforceMinimum ? 0.01 : 0.0) // Timer for debouncing rapid changes readonly property Timer timer: Timer { @@ -470,13 +469,7 @@ Singleton { function increaseBrightness(): void { const value = !isNaN(monitor.queuedBrightness) ? monitor.queuedBrightness : monitor.brightness; - // Enforce minimum brightness if enabled - if (Settings.data.brightness.enforceMinimum && value < minBrightnessValue) { - setBrightnessDebounced(Math.max(stepSize, minBrightnessValue)); - } else { - // Normal brightness increase - setBrightnessDebounced(value + stepSize); - } + setBrightnessDebounced(value + stepSize); } function decreaseBrightness(): void { @@ -485,7 +478,7 @@ Singleton { } function setBrightness(value: real): void { - value = Math.max(minBrightnessValue, Math.min(1, value)); + value = Math.min(1, value); var rounded = Math.round(value * 100); // Always update internal value and trigger UI feedback immediately @@ -522,11 +515,12 @@ Singleton { } else if (!isDdc) { monitor.commandRunning = true; monitor.ignoreNextChange = true; + var setMin = Settings.data.brightness.enforceMinimum ? "-n" : ""; var backlightDeviceName = root.getBacklightDeviceName(monitor.backlightDevice); if (backlightDeviceName !== "") { - setBrightnessProc.command = ["brightnessctl", "-d", backlightDeviceName, "s", rounded + "%"]; + setBrightnessProc.command = ["brightnessctl", "-d", backlightDeviceName, "s", rounded + "%", setMin]; } else { - setBrightnessProc.command = ["brightnessctl", "s", rounded + "%"]; + setBrightnessProc.command = ["brightnessctl", "s", rounded + "%", setMin]; } setBrightnessProc.running = true; }