(fix) fixed night light component for Plasma 6.1

Prayag2 · Jun 21, 2024 · ebcaac7 · ebcaac7
1 parent 23907e7
commit ebcaac7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 30 deletions.
diff --git a/package/contents/ui/components/RedShift.qml b/package/contents/ui/components/RedShift.qml
@@ -22,22 +22,18 @@ Lib.CardButton {
 
     Kirigami.Icon {
         anchors.fill: parent
-        source: monitor.running ? "redshift-status-on" : "redshift-status-off"
-    }
-    onClicked: {
-        Funcs.toggleNightLight();
+        source: control.running ? "redshift-status-on" : "redshift-status-off"
     }
+    onClicked: control.toggleInhibition()
 
     // Components //
 
-    NightColorInhibitor {
-        id: inhibitor
-    }
-
-    NightColorMonitor {
-        id: redMonitor
+    /// Plasma 6.1 ///
+    NightLightControl {
+        id: control
 
-        readonly property bool transitioning: monitor.currentTemperature != monitor.targetTemperature
-        readonly property bool hasSwitchingTimes: monitor.mode != 3
+        readonly property bool transitioning: control.currentTemperature != control.targetTemperature
+        readonly property bool hasSwitchingTimes: control.mode != 3
+        readonly property bool togglable: !control.inhibited || control.inhibitedFromApplet
     }
 }
diff --git a/package/contents/ui/js/funcs.js b/package/contents/ui/js/funcs.js
@@ -96,24 +96,6 @@ function toggleDoNotDisturb() {
     notificationSettings.save()
 }
 
-function toggleNightLight() {
-    if (!monitor.available) {
-        return;
-    }
-
-    switch (inhibitor.state) {
-        case NightColorInhibitor.Inhibiting:
-        case NightColorInhibitor.Inhibited:
-            inhibitor.uninhibit();
-            break;
-
-            case NightColorInhibitor.Uninhibiting:
-        case NightColorInhibitor.Uninhibited:
-            inhibitor.inhibit();
-            break;
-    }
-}
-
 function volumePercent(volume) {
     return volume / Vol.PulseAudio.NormalVolume * 100
 }