diff options
Diffstat (limited to 'apps/gui/statusbar.c')
-rw-r--r-- | apps/gui/statusbar.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index e93fc9649e..e082063a6f 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -191,10 +191,10 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
191 | } | 191 | } |
192 | else | 192 | else |
193 | { | 193 | { |
194 | #else | 194 | #else /* CONFIG_CHARGING < CHARGING_MONITOR */ |
195 | lasttime = current_tick; | 195 | lasttime = current_tick; |
196 | { | 196 | { |
197 | #endif | 197 | #endif /* CONFIG_CHARGING < CHARGING_MONITOR */ |
198 | /* animate in (max.) 4 steps, starting near the current charge level */ | 198 | /* animate in (max.) 4 steps, starting near the current charge level */ |
199 | if (TIME_AFTER(current_tick, bar->battery_icon_switch_tick)) | 199 | if (TIME_AFTER(current_tick, bar->battery_icon_switch_tick)) |
200 | { | 200 | { |
@@ -205,7 +205,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
205 | } | 205 | } |
206 | } | 206 | } |
207 | else | 207 | else |
208 | #endif | 208 | #endif /* CONFIG_CHARGING */ |
209 | { | 209 | { |
210 | bar->info.batt_charge_step = -1; | 210 | bar->info.batt_charge_step = -1; |
211 | if (battery_level_safe()) | 211 | if (battery_level_safe()) |
@@ -254,13 +254,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
254 | display->fillrect(0, 0, display->width, STATUSBAR_HEIGHT); | 254 | display->fillrect(0, 0, display->width, STATUSBAR_HEIGHT); |
255 | display->set_drawmode(DRMODE_SOLID); | 255 | display->set_drawmode(DRMODE_SOLID); |
256 | 256 | ||
257 | #else | ||
258 | |||
259 | /* players always "redraw" */ | ||
260 | { | ||
261 | #endif /* HAVE_LCD_BITMAP */ | ||
262 | |||
263 | #ifdef HAVE_LCD_BITMAP | ||
264 | if (bar->info.battery_state) | 257 | if (bar->info.battery_state) |
265 | gui_statusbar_icon_battery(display, bar->info.battlevel, | 258 | gui_statusbar_icon_battery(display, bar->info.battlevel, |
266 | bar->info.batt_charge_step); | 259 | bar->info.batt_charge_step); |
@@ -281,7 +274,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
281 | STATUSBAR_PLUG_X_POS, | 274 | STATUSBAR_PLUG_X_POS, |
282 | STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH, | 275 | STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH, |
283 | STATUSBAR_HEIGHT); | 276 | STATUSBAR_HEIGHT); |
284 | #endif | 277 | #endif /* CONFIG_CHARGING */ |
285 | #ifdef HAVE_RECORDING | 278 | #ifdef HAVE_RECORDING |
286 | /* turn off volume display in recording screen */ | 279 | /* turn off volume display in recording screen */ |
287 | bool recscreen_on = in_recording_screen(); | 280 | bool recscreen_on = in_recording_screen(); |
@@ -332,8 +325,8 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
332 | #endif | 325 | #endif |
333 | display->update_rect(0, 0, display->width, STATUSBAR_HEIGHT); | 326 | display->update_rect(0, 0, display->width, STATUSBAR_HEIGHT); |
334 | bar->lastinfo = bar->info; | 327 | bar->lastinfo = bar->info; |
335 | #endif /* HAVE_LCD_BITMAP */ | ||
336 | } | 328 | } |
329 | #endif /* HAVE_LCD_BITMAP */ | ||
337 | 330 | ||
338 | 331 | ||
339 | #ifdef HAVE_LCD_CHARCELLS | 332 | #ifdef HAVE_LCD_CHARCELLS |