4 files changed, 50 insertions, 9 deletions

diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 0b41f88cdc..64b8939ee9 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -937,7 +937,14 @@ static void statusbar_toggle_handler(void *data)
         }
         else
         {
-            vp->y      = STATUSBAR_HEIGHT;
+            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;
+            vp->y      = bar_at_top?STATUSBAR_HEIGHT:0;
             vp->height = screens[i].lcdheight - STATUSBAR_HEIGHT;
         }
     }
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index ec804ab41f..dca4169603 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -263,10 +263,20 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw)
         memcmp(&(bar->info), &(bar->lastinfo), sizeof(struct status_info)))
     {
         struct viewport vp;
+        bool bar_at_top = true;
         viewport_set_defaults(&vp, display->screen_type);
         vp.height = STATUSBAR_HEIGHT;
         vp.x = STATUSBAR_X_POS;
-        vp.y = STATUSBAR_Y_POS;
+#ifdef HAVE_REMOTE_LCD
+        if (display->screen_type == SCREEN_REMOTE)
+            bar_at_top = global_settings.remote_statusbar != STATUSBAR_BOTTOM;
+        else
+#endif
+            bar_at_top = global_settings.statusbar != STATUSBAR_BOTTOM;
+        if (bar_at_top)    
+            vp.y = 0;
+        else
+            vp.y = display->lcdheight - STATUSBAR_HEIGHT;    
         display->set_viewport(&vp);
         display->set_drawmode(DRMODE_SOLID|DRMODE_INVERSEVID);
         display->fillrect(0, 0, display->getwidth(), STATUSBAR_HEIGHT);
@@ -814,7 +824,7 @@ void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars,
     }
 }
 
-void gui_statusbar_changed(bool enabled)
+void gui_statusbar_changed(int enabled)
 {
     (void)enabled;
     send_event(GUI_EVENT_STATUSBAR_TOGGLE, NULL);
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h
index f6203c22d9..db0ff9d780 100644
--- a/apps/gui/statusbar.h
+++ b/apps/gui/statusbar.h
@@ -98,6 +98,6 @@ struct gui_syncstatusbar
 
 extern void gui_syncstatusbar_init(struct gui_syncstatusbar * bars);
 extern void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, bool force_redraw);
-void gui_statusbar_changed(bool enabled);
+void gui_statusbar_changed(int enabled);
 
 #endif /*_GUI_STATUSBAR_H_*/
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index 22d3eb3eb8..67f63e349b 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -49,30 +49,47 @@ int viewport_get_nb_lines(struct viewport *vp)
 
 static bool showing_bars(enum screen_type screen)
 {
+    bool ignore = statusbar_enabled & VP_SB_IGNORE_SETTING(screen);
     if (statusbar_enabled & VP_SB_ONSCREEN(screen))
+    {
 #ifdef HAVE_LCD_BITMAP
-        return global_settings.statusbar ||
-               (statusbar_enabled & VP_SB_IGNORE_SETTING(screen));
+#ifdef HAVE_REMOTE_LCD
+        if (screen == SCREEN_REMOTE)
+            return global_settings.remote_statusbar || ignore;
+#endif
+        return global_settings.statusbar || ignore;
 #else
         return true;
 #endif
+    }
     return false;
 }    
 
 void viewport_set_defaults(struct viewport *vp, enum screen_type screen)
 {
+    bool bar_at_top = true;
     vp->x = 0;
     vp->width = screens[screen].lcdwidth;
 
 #ifdef HAVE_LCD_BITMAP
     vp->drawmode = DRMODE_SOLID;
     vp->font = FONT_UI; /* default to UI to discourage SYSFONT use */
-
-    vp->y = showing_bars(screen)?STATUSBAR_HEIGHT:0;
+#ifdef HAVE_REMOTE_LCD
+    if (screen == SCREEN_REMOTE)
+        bar_at_top = global_settings.remote_statusbar != STATUSBAR_BOTTOM;
+    else
+#endif
+        bar_at_top = global_settings.statusbar != STATUSBAR_BOTTOM;
+        
+    vp->height = screens[screen].lcdheight;
+    if (bar_at_top && showing_bars(screen))
+        vp->y = STATUSBAR_HEIGHT;
+    else 
+        vp->y = 0;
 #else
     vp->y = 0;
 #endif
-    vp->height = screens[screen].lcdheight - vp->y;
+    vp->height = screens[screen].lcdheight - (showing_bars(screen)?STATUSBAR_HEIGHT:0);
 
 #ifdef HAVE_REMOTE_LCD
     /* We only need this test if there is a remote LCD */
@@ -136,5 +153,12 @@ void viewportmanager_draw_statusbars(void* data)
 void viewportmanager_statusbar_changed(void* data)
 {
     (void)data;
+    statusbar_enabled = 0;
+    if (global_settings.statusbar != STATUSBAR_OFF)
+        statusbar_enabled = VP_SB_ONSCREEN(SCREEN_MAIN);
+#ifdef HAVE_REMOTE_LCD
+    if (global_settings.remote_statusbar != STATUSBAR_OFF)
+        statusbar_enabled |= VP_SB_ONSCREEN(SCREEN_REMOTE);
+#endif
     viewportmanager_set_statusbar(statusbar_enabled);
 }