ZacharyZhang-NY/omarchycn
4
5
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Fix battery indicator scale on omarchy-shell bar

Browse Source 
Quickshell's UPowerDevice.percentage is a 0.0-1.0 real (energy /
energyCapacity), not 0-100. The bar was treating it as 0-100, so a 99%
charge picked the lowest icon, the tooltip read "1%", and the
low-battery active state was always true.
This commit is contained in:
Ryan Hughes
2026-05-16 00:27:18 -04:00
parent 620ab05e9d
commit 227d32544f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
default/quickshell/omarchy-shell/plugins/bar/Bar.qml
+3 -3
View File
@@ -564,7 +564,7 @@ Item {
var chargingIcons = ["󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"] var chargingIcons = ["󰢜", "󰂆", "󰂇", "󰂈", "󰢝", "󰂉", "󰢞", "󰂊", "󰂋", "󰂅"]
var defaultIcons = ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"] var defaultIcons = ["󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"]
var index = Math.max(0, Math.min(9, Math.floor(device.percentage / 10))) var index = Math.max(0, Math.min(9, Math.floor(device.percentage * 10)))
if (device.state === UPowerDeviceState.FullyCharged) return "󰂅" if (device.state === UPowerDeviceState.FullyCharged) return "󰂅"
if (!UPower.onBattery && device.state !== UPowerDeviceState.Charging) return "" if (!UPower.onBattery && device.state !== UPowerDeviceState.Charging) return ""
@@ -666,7 +666,7 @@ Item {
if (!device || !device.isPresent) return "" if (!device || !device.isPresent) return ""
var direction = UPower.onBattery ? "↓" : "↑" var direction = UPower.onBattery ? "↓" : "↑"
return Math.round(device.changeRate) + "W" + direction + " " + Math.round(device.percentage) + "%" return Math.round(device.changeRate) + "W" + direction + " " + Math.round(device.percentage * 100) + "%"
} }
function trayIconSource(icon) { function trayIconSource(icon) {
@@ -1952,7 +1952,7 @@ Item {
text: root.batteryIcon() text: root.batteryIcon()
horizontalMargin: 8.5 horizontalMargin: 8.5
visible: device !== null && device.isPresent && device.percentage > 0 visible: device !== null && device.isPresent && device.percentage > 0
active: device !== null && device.percentage <= 20 && UPower.onBattery active: device !== null && device.percentage <= 0.2 && UPower.onBattery
tooltipText: root.batteryTooltip() tooltipText: root.batteryTooltip()
onPressed: function(button) { onPressed: function(button) {
if (button === Qt.RightButton) root.run("omarchy-notification-send \"$(omarchy-battery-status)\"") if (button === Qt.RightButton) root.run("omarchy-notification-send \"$(omarchy-battery-status)\"")