summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2009-01-04 05:36:23 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2009-01-04 05:36:23 +0000
commitde4d0306533feca37b60cfbff06558a377590c7f (patch)
tree60744f225d9b4494d8058b4e1ed78a96527441b2
parent870c58619da14c936032f4099254ef717919e602 (diff)
downloadrockbox-de4d0306533feca37b60cfbff06558a377590c7f.zip
rockbox-de4d0306533feca37b60cfbff06558a377590c7f.tar.gz
rockbox-de4d0306533feca37b60cfbff06558a377590c7f.tar.bz2
rockbox-de4d0306533feca37b60cfbff06558a377590c7f.tar.xz
minor code reshuffle to not call viewport_set_default so often
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19667 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/statusbar.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index b4e99f8..e258821 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -174,12 +174,6 @@ static void gui_statusbar_init(struct gui_statusbar * bar)
void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
{
struct screen * display = bar->display;
- struct viewport vp;
- viewport_set_defaults(&vp, display->screen_type);
- vp.height = STATUSBAR_HEIGHT;
- vp.x = STATUSBAR_X_POS;
- vp.y = STATUSBAR_Y_POS;
- display->set_viewport(&vp);
#ifdef HAVE_LCD_CHARCELLS
int val;
@@ -267,6 +261,12 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
#endif
memcmp(&(bar->info), &(bar->lastinfo), sizeof(struct status_info)))
{
+ struct viewport vp;
+ viewport_set_defaults(&vp, display->screen_type);
+ vp.height = STATUSBAR_HEIGHT;
+ vp.x = STATUSBAR_X_POS;
+ vp.y = STATUSBAR_Y_POS;
+ display->set_viewport(&vp);
display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
display->fillrect(0, 0, display->getwidth(), STATUSBAR_HEIGHT);
display->set_drawmode(DRMODE_SOLID);
@@ -342,6 +342,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
gui_statusbar_led(display);
#endif
display->update_viewport();
+ display->set_viewport(NULL);
bar->lastinfo = bar->info;
}
#endif /* HAVE_LCD_BITMAP */
@@ -378,7 +379,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
display->icon(ICON_PARAM, param);
display->icon(ICON_USB, usb);
#endif /* HAVE_LCD_CHARCELLS */
- display->set_viewport(NULL);
}
#ifdef HAVE_LCD_BITMAP