3 files changed, 39 insertions, 5 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 85cc65d410..e674c9becf 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -129,6 +129,35 @@ bool skin_update(struct gui_wps *gwps, unsigned int update_type)
     return retval;
 }
 
+void skin_statusbar_changed(struct gui_wps *skin)
+{
+    if (!skin)
+        return;
+    struct wps_data *data = skin->data;
+    const struct screen *display = skin->display;
+
+    struct viewport *vp = &find_viewport(VP_DEFAULT_LABEL, data)->vp;
+    viewport_set_fullscreen(vp, display->screen_type);
+
+    if (data->wps_sb_tag)
+    {   /* fix up the default viewport */
+        if (data->show_sb_on_wps)
+        {
+            bool bar_at_top =
+                statusbar_position(display->screen_type) != STATUSBAR_BOTTOM;
+
+            vp->y       = bar_at_top?STATUSBAR_HEIGHT:0;
+            vp->height  = display->lcdheight - STATUSBAR_HEIGHT;
+        }
+        else
+        {
+            vp->y       = 0;
+            vp->height  = display->lcdheight;
+        }
+    }
+
+    
+}
 
 #ifdef HAVE_LCD_BITMAP
 
@@ -1141,7 +1170,7 @@ static bool skin_redraw(struct gui_wps *gwps, unsigned refresh_mode)
 
     if (refresh_mode & WPS_REFRESH_STATUSBAR)
     {
-        gwps_draw_statusbars();
+        viewportmanager_set_statusbar(*gwps->statusbars);
     }
     /* Restore the default viewport */
     display->set_viewport(NULL);
diff --git a/apps/gui/skin_engine/skin_engine.h b/apps/gui/skin_engine/skin_engine.h
index 3ec7b93a9d..c52f720d06 100644
--- a/apps/gui/skin_engine/skin_engine.h
+++ b/apps/gui/skin_engine/skin_engine.h
@@ -51,4 +51,7 @@ bool skin_data_load(struct wps_data *wps_data,
 
 /* initial setup of wps_data */
 void skin_data_init(struct wps_data *wps_data);
+
+/* call this in statusbar toggle handlers if needed */
+void skin_statusbar_changed(struct gui_wps*);
 #endif
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index 20a9dde9f9..fbd18b9f73 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -286,10 +286,6 @@ struct wps_data
     unsigned int button_time_volume;
 };
 
-
-/* Redraw statusbars if necessary */
-void gwps_draw_statusbars(void);
-
 /* Returns the index of the last subline's token in the token array.
    line - 0-based line number
    subline - 0-based subline number within the line
@@ -332,6 +328,12 @@ struct gui_wps
     struct screen *display;
     struct wps_data *data;
     struct wps_state *state;
+
+    /* suitable for the viewportmanager, possibly only temporary here
+     * needs to be same for all screens! can't be split up for screens
+     * due to what viewportmanager_set_statusbar() accepts
+     * (FIXME?) */
+    int *statusbars;
 };
 
 /* gui_wps end */