From d625618d1b0cee5dedd7d3eebb05764cbd00418f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 26 May 2020 21:26:22 +0200 Subject: [PATCH] power: Fix icon when discharging at 100% The special-case for a fill level of 100 introduced in commit 5fd52e99d39 should only apply when charging, for the discharging state there's a proper battery-level-100-symbolic icon. https://gitlab.gnome.org/GNOME/gnome-shell/issues/2286 --- js/ui/status/power.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/js/ui/status/power.js b/js/ui/status/power.js index 624228c39..ea8acd018 100644 --- a/js/ui/status/power.js +++ b/js/ui/status/power.js @@ -112,12 +112,12 @@ class Indicator extends PanelMenu.SystemIndicator { let chargingState = this._proxy.State == UPower.DeviceState.CHARGING ? '-charging' : ''; let fillLevel = 10 * Math.floor(this._proxy.Percentage / 10); - let icon; - if (this._proxy.State == UPower.DeviceState.FULLY_CHARGED || - fillLevel === 100) - icon = 'battery-level-100-charged-symbolic'; - else - icon = 'battery-level-%d%s-symbolic'.format(fillLevel, chargingState); + const charged = + this._proxy.State === UPower.DeviceState.FULLY_CHARGED || + (this._proxy.State === UPower.DeviceState.CHARGING && fillLevel === 100); + const icon = charged + ? 'battery-level-100-charged-symbolic' + : 'battery-level-%d%s-symbolic'.format(fillLevel, chargingState); // Make sure we fall back to fallback-icon-name and not GThemedIcon's // default fallbacks