diff --git a/src/go.mod b/src/go.mod index a0d37d86..a97aca9d 100644 --- a/src/go.mod +++ b/src/go.mod @@ -34,6 +34,6 @@ require ( howett.net/plist v0.0.0-20201203080718-1454fab16a06 // indirect ) -replace github.com/distatus/battery v0.10.0 => github.com/JanDeDobbeleer/battery v0.10.0-1 +replace github.com/distatus/battery v0.10.0 => github.com/JanDeDobbeleer/battery v0.10.0-2 replace github.com/gookit/color v1.3.5 => github.com/JanDeDobbeleer/color v1.3.5-1 diff --git a/src/go.sum b/src/go.sum index 44385de4..22a0d741 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,7 +1,7 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/JanDeDobbeleer/battery v0.10.0-1 h1:3N3i3xgvrrb3eCuX4kJnmbKzOiqkH1Ly1D7lAJJJTqA= -github.com/JanDeDobbeleer/battery v0.10.0-1/go.mod h1:STnSvFLX//eEpkaN7qWRxCWxrWOcssTDgnG4yqq9BRE= +github.com/JanDeDobbeleer/battery v0.10.0-2 h1:nmFASq8Rmo0sHz6gLT3pXHh7uNABLEgEozKb2tRPgVY= +github.com/JanDeDobbeleer/battery v0.10.0-2/go.mod h1:STnSvFLX//eEpkaN7qWRxCWxrWOcssTDgnG4yqq9BRE= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= diff --git a/src/segment_battery.go b/src/segment_battery.go index feb71d29..1811c9a5 100644 --- a/src/segment_battery.go +++ b/src/segment_battery.go @@ -60,7 +60,7 @@ func (b *batt) enabled() bool { b.Percentage = int(math.Min(100, batteryPercentage)) var colorPorperty Property switch b.Battery.State { - case battery.Discharging: + case battery.Discharging, battery.NotCharging: colorPorperty = DischargingColor b.Icon = b.props.getString(DischargingIcon, "") case battery.Charging: @@ -107,7 +107,7 @@ func (b *batt) enabledWhileError(err error) bool { func (b *batt) mapMostLogicalState(currentState, newState battery.State) battery.State { switch currentState { - case battery.Discharging: + case battery.Discharging, battery.NotCharging: return battery.Discharging case battery.Empty: return newState