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.tar.gz rockbox-12b8f8de892920a99d9740f2e26fa7c4811de5b6.zip |
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 d50069eac1..61553146d4 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) | |||
85 | if (wps->data->wps_sb_tag) | 85 | if (wps->data->wps_sb_tag) |
86 | draw = wps->data->show_sb_on_wps; | 86 | draw = wps->data->show_sb_on_wps; |
87 | 87 | ||
88 | #if NB_SCREENS > 1 | ||
89 | /* multi screen targets could show the bars on one screen but not both | ||
90 | * so the viewportmanager can't be used in its current form... | ||
91 | * Also, the WPS is a special screen so doing this is reasonable. | ||
92 | */ | ||
93 | if (draw) | ||
94 | { | ||
95 | struct gui_statusbar *bar; | ||
96 | bar = &statusbars.statusbars[wps->data->remote_wps?SCREEN_REMOTE:SCREEN_MAIN]; | ||
97 | gui_statusbar_draw(bar, force); | ||
98 | } | ||
99 | #else | ||
88 | viewportmanager_set_statusbar(draw); | 100 | viewportmanager_set_statusbar(draw); |
101 | #endif | ||
89 | } | 102 | } |
90 | #else | 103 | #else |
91 | #define gui_wps_statusbar_draw(wps, force) | 104 | #define gui_wps_statusbar_draw(wps, force) |
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index c84e7c63fe..dd8978c8bb 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -128,6 +128,7 @@ long gui_wps_show(void) | |||
128 | int i; | 128 | int i; |
129 | long last_left = 0, last_right = 0; | 129 | long last_left = 0, last_right = 0; |
130 | 130 | ||
131 | viewportmanager_set_statusbar(false); | ||
131 | wps_state_init(); | 132 | wps_state_init(); |
132 | 133 | ||
133 | #ifdef HAVE_LCD_CHARCELLS | 134 | #ifdef HAVE_LCD_CHARCELLS |