From dbb3d7c67b51f157bc993987068786dc2e6140b6 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Wed, 8 Oct 2025 13:16:25 +1100 Subject: internal: fix bat charge state Counts fully charged and pending charge as charging, same as prior to 90c051cf --- 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 470e381..27fd9f8 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.displayDevice.state === UPowerDeviceState.Charging; + const charging = [UPowerDeviceState.Charging, UPowerDeviceState.FullyCharged, UPowerDeviceState.PendingCharge].includes(UPower.displayDevice.state); 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 021f084..0e64343 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.displayDevice.state === UPowerDeviceState.Charging ? "(+) " : ""}${Math.round(UPower.displayDevice.percentage * 100)}%` + text: `BATT: ${[UPowerDeviceState.Charging, UPowerDeviceState.FullyCharged, UPowerDeviceState.PendingCharge].includes(UPower.displayDevice.state) ? "(+) " : ""}${Math.round(UPower.displayDevice.percentage * 100)}%` } } } -- cgit v1.2.3-freya