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

1 files changed, 13 insertions, 9 deletions

diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c
index 14c8d30c6a..09bcab8443 100644
--- a/apps/gui/wps_parser.c
+++ b/apps/gui/wps_parser.c
@@ -1682,16 +1682,20 @@ bool wps_data_load(struct wps_data *wps_data,
     /* Initialise the first (default) viewport */
     wps_data->viewports[0].vp.x          = 0;
     wps_data->viewports[0].vp.width      = display->getwidth();
-    if (!global_settings.statusbar)
+    wps_data->viewports[0].vp.height     = display->getheight();
+    switch (statusbar_position(display->screen_type))
     {
-        wps_data->viewports[0].vp.y      = 0;
-        wps_data->viewports[0].vp.height = display->getheight();
-    }
-    else
-    {
-        wps_data->viewports[0].vp.y      = STATUSBAR_HEIGHT;
-        wps_data->viewports[0].vp.height = display->getheight() -
-                                            STATUSBAR_HEIGHT;
+        case STATUSBAR_OFF:
+            wps_data->viewports[0].vp.y      = 0;
+            break;
+        case STATUSBAR_TOP:        
+            wps_data->viewports[0].vp.y       = STATUSBAR_HEIGHT;
+            wps_data->viewports[0].vp.height -= STATUSBAR_HEIGHT;
+            break;
+        case STATUSBAR_BOTTOM:
+            wps_data->viewports[0].vp.y       = 0;
+            wps_data->viewports[0].vp.height -= STATUSBAR_HEIGHT;
+            break;
     }
 #ifdef HAVE_LCD_BITMAP
     wps_data->viewports[0].vp.font       = FONT_UI;