From 90c051cfa17bc79e046cbecd1dc87e571e43e787 Mon Sep 17 00:00:00 2001
From: Dylan Myers <131212515+taksyon@users.noreply.github.com>
Date: Mon, 6 Oct 2025 04:51:42 -0400
Subject: internal: fix battery charging logic for tray and lock (#751)

* Update StatusIcons.qml --- Fix battery chargiing logic

idk what the difference is in the return value of UPower.onBattery and UPower.displayDevice.state, but the former always returns false after unplugging my laptop. Changing this to the more specific displayDevice.state === 2 fixes this

* Fetch.qml --- Fix battery charging boolean logic

* Use enum value for UPowerDeviceState instead of index

* Use enum value for UPowerDeviceState instead of index

* Update Fetch.qml --- invert battery conditional logic
---
 modules/bar/components/StatusIcons.qml | 2 +-
 modules/lock/Fetch.qml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/bar/components/StatusIcons.qml b/modules/bar/components/StatusIcons.qml
index c1ad697..470e381 100644
--- a/modules/bar/components/StatusIcons.qml
+++ b/modules/bar/components/StatusIcons.qml
@@ -235,7 +235,7 @@ StyledRect {
                     }
 
                     const perc = UPower.displayDevice.percentage;
-                    const charging = !UPower.onBattery;
+                    const charging = UPower.displayDevice.state === UPowerDeviceState.Charging;
                     if (perc === 1)
                         return charging ? "battery_charging_full" : "battery_full";
                     let level = Math.floor(perc * 7);
diff --git a/modules/lock/Fetch.qml b/modules/lock/Fetch.qml
index 8f82e88..021f084 100644
--- a/modules/lock/Fetch.qml
+++ b/modules/lock/Fetch.qml
@@ -114,7 +114,7 @@ ColumnLayout {
                 active: UPower.displayDevice.isLaptopBattery
 
                 sourceComponent: FetchText {
-                    text: `BATT: ${UPower.onBattery ? "" : "(+) "}${Math.round(UPower.displayDevice.percentage * 100)}%`
+                    text: `BATT: ${UPower.displayDevice.state === UPowerDeviceState.Charging ? "(+) " : ""}${Math.round(UPower.displayDevice.percentage * 100)}%`
                 }
             }
         }
-- 
cgit v1.2.3-freya