diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-01-04 05:36:23 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-01-04 05:36:23 +0000 |
commit | de4d0306533feca37b60cfbff06558a377590c7f (patch) | |
tree | 60744f225d9b4494d8058b4e1ed78a96527441b2 /apps/gui | |
parent | 870c58619da14c936032f4099254ef717919e602 (diff) | |
download | rockbox-de4d0306533feca37b60cfbff06558a377590c7f.tar.gz rockbox-de4d0306533feca37b60cfbff06558a377590c7f.zip |
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
Diffstat (limited to 'apps/gui')
-rw-r--r-- | apps/gui/statusbar.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index b4e99f8885..e258821ae1 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c | |||
@@ -174,12 +174,6 @@ static void gui_statusbar_init(struct gui_statusbar * bar) | |||
174 | void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | 174 | void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) |
175 | { | 175 | { |
176 | struct screen * display = bar->display; | 176 | struct screen * display = bar->display; |
177 | struct viewport vp; | ||
178 | viewport_set_defaults(&vp, display->screen_type); | ||
179 | vp.height = STATUSBAR_HEIGHT; | ||
180 | vp.x = STATUSBAR_X_POS; | ||
181 | vp.y = STATUSBAR_Y_POS; | ||
182 | display->set_viewport(&vp); | ||
183 | 177 | ||
184 | #ifdef HAVE_LCD_CHARCELLS | 178 | #ifdef HAVE_LCD_CHARCELLS |
185 | int val; | 179 | int val; |
@@ -267,6 +261,12 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
267 | #endif | 261 | #endif |
268 | memcmp(&(bar->info), &(bar->lastinfo), sizeof(struct status_info))) | 262 | memcmp(&(bar->info), &(bar->lastinfo), sizeof(struct status_info))) |
269 | { | 263 | { |
264 | struct viewport vp; | ||
265 | viewport_set_defaults(&vp, display->screen_type); | ||
266 | vp.height = STATUSBAR_HEIGHT; | ||
267 | vp.x = STATUSBAR_X_POS; | ||
268 | vp.y = STATUSBAR_Y_POS; | ||
269 | display->set_viewport(&vp); | ||
270 | display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); | 270 | display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID); |
271 | display->fillrect(0, 0, display->getwidth(), STATUSBAR_HEIGHT); | 271 | display->fillrect(0, 0, display->getwidth(), STATUSBAR_HEIGHT); |
272 | display->set_drawmode(DRMODE_SOLID); | 272 | display->set_drawmode(DRMODE_SOLID); |
@@ -342,6 +342,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
342 | gui_statusbar_led(display); | 342 | gui_statusbar_led(display); |
343 | #endif | 343 | #endif |
344 | display->update_viewport(); | 344 | display->update_viewport(); |
345 | display->set_viewport(NULL); | ||
345 | bar->lastinfo = bar->info; | 346 | bar->lastinfo = bar->info; |
346 | } | 347 | } |
347 | #endif /* HAVE_LCD_BITMAP */ | 348 | #endif /* HAVE_LCD_BITMAP */ |
@@ -378,7 +379,6 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw) | |||
378 | display->icon(ICON_PARAM, param); | 379 | display->icon(ICON_PARAM, param); |
379 | display->icon(ICON_USB, usb); | 380 | display->icon(ICON_USB, usb); |
380 | #endif /* HAVE_LCD_CHARCELLS */ | 381 | #endif /* HAVE_LCD_CHARCELLS */ |
381 | display->set_viewport(NULL); | ||
382 | } | 382 | } |
383 | 383 | ||
384 | #ifdef HAVE_LCD_BITMAP | 384 | #ifdef HAVE_LCD_BITMAP |