diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-07-08 00:51:03 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-07-08 00:51:03 +0000 |
| commit | a06f6eedae542afc48cf0aa5e30b4647e18547a2 (patch) | |
| tree | 1b14ae67f85e37e9ed4186094c2cf5de8c8b453b /apps/gui/gwps.c | |
| parent | 008f611bca3173e21027a568540281c0d7d03ef2 (diff) | |
| download | rockbox-a06f6eedae542afc48cf0aa5e30b4647e18547a2.tar.gz rockbox-a06f6eedae542afc48cf0aa5e30b4647e18547a2.zip | |
cleanup the remote+main statusbar handling a bit, and fix the bug where the remote wps might reserve the space for the statusbar even if its disabled
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21709 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/gwps.c')
| -rw-r--r-- | apps/gui/gwps.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index 64b8939ee9..95cca5c117 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c @@ -245,8 +245,8 @@ static void gwps_fix_statusbars(void) bool draw = false; if (gui_wps[i].data->wps_sb_tag) draw = gui_wps[i].data->show_sb_on_wps; - else if (global_settings.statusbar) - wpsbars |= VP_SB_ONSCREEN(i); + else if (statusbar_position(i) != STATUSBAR_OFF) + draw = true; if (draw) wpsbars |= (VP_SB_ONSCREEN(i) | VP_SB_IGNORE_SETTING(i)); } @@ -937,13 +937,7 @@ static void statusbar_toggle_handler(void *data) } else { - bool bar_at_top = true; -#ifdef HAVE_REMOTE_LCD - if (i == SCREEN_REMOTE) - bar_at_top = global_settings.remote_statusbar != STATUSBAR_BOTTOM; - else -#endif - bar_at_top = global_settings.statusbar != STATUSBAR_BOTTOM; + bool bar_at_top = statusbar_position(i) != STATUSBAR_BOTTOM; vp->y = bar_at_top?STATUSBAR_HEIGHT:0; vp->height = screens[i].lcdheight - STATUSBAR_HEIGHT; } |