summaryrefslogtreecommitdiff
path: root/wasp
diff options
context:
space:
mode:
authorDaniel Thompson <daniel@redfelineninja.org.uk>2020-12-13 16:46:19 (GMT)
committerDaniel Thompson <daniel@redfelineninja.org.uk>2020-12-13 16:51:07 (GMT)
commit4468285c343d7f4044748c6232f3e7510def9dce (patch)
tree6e56a34216bd39af04f7d8b9f81d8b66bcb0120c /wasp
parente44e605b7a2dd09e7d07c85ca1a73c5ce5b6d92b (diff)
widgets: BatteryMeter: Fix theme handling
Add the battery frame to the theme so it matches the frame used for charging and rename accordingly. Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
Diffstat (limited to 'wasp')
-rw-r--r--wasp/wasp.py2
-rw-r--r--wasp/widgets.py5
2 files changed, 4 insertions, 3 deletions
diff --git a/wasp/wasp.py b/wasp/wasp.py
index 4837e12..2422cfd 100644
--- a/wasp/wasp.py
+++ b/wasp/wasp.py
@@ -529,7 +529,7 @@ class Manager():
"""Returns the relevant part of theme. For more see ../tools/themer.py"""
theme_parts = ("ble",
"scroll-indicator",
- "battery-charging",
+ "battery",
"status-clock",
"notify-icon",
"accent-mid",
diff --git a/wasp/widgets.py b/wasp/widgets.py
index 1d79e22..d39de90 100644
--- a/wasp/widgets.py
+++ b/wasp/widgets.py
@@ -40,7 +40,7 @@ class BatteryMeter:
if watch.battery.charging():
if self.level != -1:
draw.rleblit(icon, pos=(239-icon[0], 0),
- fg=wasp.system.theme('battery-charging'))
+ fg=wasp.system.theme('battery'))
self.level = -1
else:
level = watch.battery.level()
@@ -59,7 +59,8 @@ class BatteryMeter:
if self.level < 0 or ((level > 5) ^ (self.level > 5)):
if level > 5:
- draw.rleblit(icon, pos=(239-icon[0], 0), fg=0x7bef)
+ draw.rleblit(icon, pos=(239-icon[0], 0),
+ fg=wasp.system.theme('battery'))
else:
rgb = 0xf800
draw.rleblit(icon, pos=(239-icon[0], 0), fg=0xf800)