diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-01-10 13:16:24 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-01-10 13:16:24 +0000 |
| commit | 12b8f8de892920a99d9740f2e26fa7c4811de5b6 (patch) | |
| tree | c3a2045dfb9080bac23f1fcb4b5c4fda7fa0838b | |
| parent | 3482a55b83bf38c6e4a8fab6815d26a36c394c99 (diff) | |
| download | rockbox-12b8f8de892920a99d9740f2e26fa7c4811de5b6.zip rockbox-12b8f8de892920a99d9740f2e26fa7c4811de5b6.tar.gz rockbox-12b8f8de892920a99d9740f2e26fa7c4811de5b6.tar.bz2 rockbox-12b8f8de892920a99d9740f2e26fa7c4811de5b6.tar.xz | |
fix FS#9772 - the statusbars were not working correclty on multi screen targets in the WPS
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19742 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/gui/gwps-common.c | 13 | ||||
| -rw-r--r-- | apps/gui/gwps.c | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index d50069e..6155314 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c @@ -85,7 +85,20 @@ static void gui_wps_statusbar_draw(struct gui_wps *wps, bool force) if (wps->data->wps_sb_tag) draw = wps->data->show_sb_on_wps; +#if NB_SCREENS > 1 + /* multi screen targets could show the bars on one screen but not both + * so the viewportmanager can't be used in its current form... + * Also, the WPS is a special screen so doing this is reasonable. + */ + if (draw) + { + struct gui_statusbar *bar; + bar = &statusbars.statusbars[wps->data->remote_wps?SCREEN_REMOTE:SCREEN_MAIN]; + gui_statusbar_draw(bar, force); + } +#else viewportmanager_set_statusbar(draw); +#endif } #else #define gui_wps_statusbar_draw(wps, force) diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index c84e7c6..dd8978c 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c @@ -128,6 +128,7 @@ long gui_wps_show(void) int i; long last_left = 0, last_right = 0; + viewportmanager_set_statusbar(false); wps_state_init(); #ifdef HAVE_LCD_CHARCELLS |