summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2021-03-02 21:23:38 -0500
committerWilliam Wilgus <me.theuser@yahoo.com>2021-03-03 03:11:02 +0000
commit5317953f4a8f58890ffedac5034205a2970ec977 (patch)
tree95751d54384128703ff15efc3d9591675e40f6cc /apps
parent2cde135cfe5c36fc2fc51893b562b5822db7ca57 (diff)
downloadrockbox-5317953f4a8f58890ffedac5034205a2970ec977.tar.gz
rockbox-5317953f4a8f58890ffedac5034205a2970ec977.tar.bz2
rockbox-5317953f4a8f58890ffedac5034205a2970ec977.zip
Battery Icon, Remove Hardcoded Overall Width
Icon no longer showed 100% with some fonts Change-Id: I6bb9d47007fa42f91daa5c336f5e9e960140db0f
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/statusbar.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 66297826c0..a961d191b2 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -53,6 +53,7 @@
#define STATUSBAR_PLUG_X_POS STATUSBAR_X_POS + \
STATUSBAR_BATTERY_WIDTH + \
ICONS_SPACING
+#define STATUSBAR_BATTERY_HEIGHT SB_ICON_HEIGHT - 1
#define STATUSBAR_PLUG_WIDTH 7
#define STATUSBAR_VOLUME_X_POS STATUSBAR_X_POS + \
STATUSBAR_BATTERY_WIDTH + \
@@ -400,12 +401,13 @@ static void gui_statusbar_icon_battery(struct screen * display, int percent,
}
else {
/* draw battery */
- display->drawrect(STATUSBAR_BATTERY_X_POS, STATUSBAR_Y_POS, 17, 7);
- display->vline(STATUSBAR_BATTERY_X_POS + 17, STATUSBAR_Y_POS + 2,
- STATUSBAR_Y_POS + 4);
+ display->drawrect(STATUSBAR_BATTERY_X_POS, STATUSBAR_Y_POS,
+ STATUSBAR_BATTERY_WIDTH - 1, STATUSBAR_BATTERY_HEIGHT);
+ display->vline(STATUSBAR_BATTERY_X_POS + STATUSBAR_BATTERY_WIDTH - 1,
+ STATUSBAR_Y_POS + 2, STATUSBAR_Y_POS + 4);
display->fillrect(STATUSBAR_BATTERY_X_POS + 1, STATUSBAR_Y_POS + 1,
- fill, 5);
+ fill, STATUSBAR_BATTERY_HEIGHT - 2);
#if LCD_DEPTH > 1
if (display->depth > 1)
{
@@ -413,8 +415,8 @@ static void gui_statusbar_icon_battery(struct screen * display, int percent,
display->set_foreground(LCD_DARKGRAY);
}
#endif
- display->fillrect(STATUSBAR_BATTERY_X_POS + 1 + fill,
- STATUSBAR_Y_POS + 1, endfill - fill, 5);
+ display->fillrect(STATUSBAR_BATTERY_X_POS + 1 + fill, STATUSBAR_Y_POS + 1,
+ endfill - fill, STATUSBAR_BATTERY_HEIGHT - 2);
#if LCD_DEPTH > 1
if (display->depth > 1)
display->set_foreground(prevfg);