mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-06 21:48:30 -04:00
battery: dont scale values and skew the actual battery values
fixes #2867 port 1.5
This commit is contained in:
@@ -12,8 +12,6 @@ Singleton {
|
|||||||
property bool suppressSound: true
|
property bool suppressSound: true
|
||||||
property bool previousPluggedState: false
|
property bool previousPluggedState: false
|
||||||
|
|
||||||
readonly property var scale: 100 / SettingsData.batteryChargeLimit
|
|
||||||
|
|
||||||
Timer {
|
Timer {
|
||||||
id: startupTimer
|
id: startupTimer
|
||||||
interval: 500
|
interval: 500
|
||||||
@@ -78,7 +76,7 @@ Singleton {
|
|||||||
return 0;
|
return 0;
|
||||||
if (batteryCapacity === 0) {
|
if (batteryCapacity === 0) {
|
||||||
if (usePreferred && preferredDeviceKnown) {
|
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;
|
_lastBatteryLevel = val;
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
@@ -88,7 +86,7 @@ Singleton {
|
|||||||
if (validBatteries.length === 0)
|
if (validBatteries.length === 0)
|
||||||
return _lastBatteryLevel;
|
return _lastBatteryLevel;
|
||||||
const avgPercentage = validBatteries.reduce((sum, b) => sum + b.percentage, 0) / validBatteries.length;
|
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;
|
_lastBatteryLevel = val;
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
@@ -96,7 +94,7 @@ Singleton {
|
|||||||
const cap = batteryCapacity;
|
const cap = batteryCapacity;
|
||||||
if (cap === 0)
|
if (cap === 0)
|
||||||
return _lastBatteryLevel;
|
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;
|
_lastBatteryLevel = val;
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user