From 883a787db7199909e790051cbdc64028336260ad Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Wed, 15 Jul 2026 10:20:59 -0400
Subject: [PATCH] battery: dont scale values and skew the actual battery values
 fixes #2867

port 1.5

(cherry picked from commit 9b67cedaa14a4a9caea3fa531f59e827be893f45)
---
 quickshell/Services/BatteryService.qml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/quickshell/Services/BatteryService.qml b/quickshell/Services/BatteryService.qml
index 553d70cd4..e9763a66e 100644
--- a/quickshell/Services/BatteryService.qml
+++ b/quickshell/Services/BatteryService.qml
@@ -12,8 +12,6 @@ Singleton {
     property bool suppressSound: true
     property bool previousPluggedState: false
 
-    readonly property var scale: 100 / SettingsData.batteryChargeLimit
-
     Timer {
         id: startupTimer
         interval: 500
@@ -78,7 +76,7 @@ Singleton {
             return 0;
         if (batteryCapacity === 0) {
             if (usePreferred && preferredDeviceKnown) {
-                const val = Math.min(100, Math.round(preferredDevice.percentage * 100 * scale));
+                const val = Math.min(100, Math.round(preferredDevice.percentage * 100));
                 _lastBatteryLevel = val;
                 return val;
             }
@@ -88,7 +86,7 @@ Singleton {
             if (validBatteries.length === 0)
                 return _lastBatteryLevel;
             const avgPercentage = validBatteries.reduce((sum, b) => sum + b.percentage, 0) / validBatteries.length;
-            const val = Math.min(100, Math.round(avgPercentage * 100 * scale));
+            const val = Math.min(100, Math.round(avgPercentage * 100));
             _lastBatteryLevel = val;
             return val;
         }
@@ -96,7 +94,7 @@ Singleton {
         const cap = batteryCapacity;
         if (cap === 0)
             return _lastBatteryLevel;
-        const val = Math.min(100, Math.round((energy * 100) / cap * scale));
+        const val = Math.min(100, Math.round((energy * 100) / cap));
         _lastBatteryLevel = val;
         return val;
     }