mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-10-23 19:54:02 -04:00
battery: pulse only the icon when the bar has no background (#3861)
(cherry picked from commit 0aab0ec09b)
This commit is contained in:
1 parent
4ab57f14b8
commit
404d5362e5
1 file changed
+3
-3
@@ -30,10 +30,10 @@ BasePill {
|
||||
readonly property bool showPower: BatteryService.isCharging ? showPowerCharging : showPowerDischarging
|
||||
readonly property bool critical: SettingsData.batteryCriticalAnimation && BatteryService.isCriticalBattery && !BatteryService.isCharging
|
||||
property real criticalPulse: 0
|
||||
readonly property color criticalForeground: battery.mixColor(Theme.error, Theme.surface, criticalPulse)
|
||||
readonly property color criticalForeground: noBackground ? battery.mixColor(Theme.error, defaultContentColor, criticalPulse) : battery.mixColor(Theme.error, Theme.surface, criticalPulse)
|
||||
|
||||
fillColor: critical ? battery.mixColor(defaultFillColor, Theme.error, criticalPulse) : defaultFillColor
|
||||
contentColor: critical ? battery.mixColor(defaultContentColor, Theme.surface, criticalPulse) : defaultContentColor
|
||||
fillColor: critical && !noBackground ? battery.mixColor(defaultFillColor, Theme.error, criticalPulse) : defaultFillColor
|
||||
contentColor: critical ? (noBackground ? criticalForeground : battery.mixColor(defaultContentColor, Theme.surface, criticalPulse)) : defaultContentColor
|
||||
|
||||
function mixColor(from, to, progress) {
|
||||
return Qt.rgba(from.r + (to.r - from.r) * progress, from.g + (to.g - from.g) * progress, from.b + (to.b - from.b) * progress, from.a + (to.a - from.a) * progress);
|
||||
|
||||
Reference in new issue
Block a user