From 6d19a569be771c0ebe1f0adcdf28927bfff5681d Mon Sep 17 00:00:00 2001 From: Brandon Low Date: Thu, 2 Mar 2006 13:37:51 +0000 Subject: Improved battery status reporting for units which support usb power / charge git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8886 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/statusbar.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'apps/gui') diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index 34ac5283af..8acfd1ca7f 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c @@ -185,7 +185,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) CONFIG_BATTERY == BATT_LIION2200 /* zero battery run time if charging */ if (charge_state > DISCHARGING) { - global_settings.runtime = 0; lasttime = current_tick; } @@ -196,7 +195,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) #endif ) { #else - global_settings.runtime = 0; lasttime = current_tick; { #endif @@ -227,19 +225,20 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) #ifdef HAVE_LCD_BITMAP if (battery_state) gui_statusbar_icon_battery(display, bar->info.battlevel); - /* draw power plug if charging */ - if (bar->info.inserted) - display->mono_bitmap(bitmap_icons_7x8[Icon_Plug], - STATUSBAR_PLUG_X_POS, - STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH, - STATUSBAR_HEIGHT); #ifdef HAVE_USB_POWER - else if (bar->info.usb_power) + if (bar->info.usb_power) display->mono_bitmap(bitmap_icons_7x8[Icon_USBPlug], STATUSBAR_PLUG_X_POS, STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH, STATUSBAR_HEIGHT); + else #endif /* HAVE_USB_POWER */ + /* draw power plug if charging */ + if (bar->info.inserted) + display->mono_bitmap(bitmap_icons_7x8[Icon_Plug], + STATUSBAR_PLUG_X_POS, + STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH, + STATUSBAR_HEIGHT); bar->info.redraw_volume = gui_statusbar_icon_volume(bar, bar->info.volume); -- cgit v1.2.3