3 files changed, 15 insertions, 32 deletions

diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index e6d31cb450..4d59a85bb1 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -291,10 +291,10 @@ int kbd_input(char* text, int buflen)
     unsigned char morse_code = 0;
     int morse_tick = 0;
 #endif
-    int oldbars = viewportmanager_set_statusbar(VP_SB_HIDE_ALL);
     FOR_NB_SCREENS(l)
     {
         struct keyboard_parameters *pm = &param[l];
+        viewportmanager_theme_enable(l, false, NULL);
 #if LCD_WIDTH >= 160 && LCD_HEIGHT >= 96
         struct screen *sc = &screens[l];
 
@@ -1126,9 +1126,9 @@ int kbd_input(char* text, int buflen)
 #endif /* HAVE_MORSE_INPUT && KBD_TOGGLE_INPUT */
 
     FOR_NB_SCREENS(l)
+    {
         screens[l].setfont(FONT_UI);
-    viewportmanager_set_statusbar(oldbars);
-    send_event(GUI_EVENT_REFRESH, NULL);
-
+        viewportmanager_theme_undo(l);
+   }
     return ret;
 }
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index 87614aec15..d49b94d434 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -494,7 +494,6 @@ int radio_screen(void)
     int button_timeout = current_tick + (2*HZ);
 #endif
     struct viewport vp[NB_SCREENS];
-    int oldbars = 0, fmbars = VP_SB_ALLSCREENS;
 #ifdef HAVE_BUTTONBAR
     struct gui_buttonbar buttonbar;
     gui_buttonbar_init(&buttonbar);
@@ -506,9 +505,6 @@ int radio_screen(void)
 
     /* always display status bar in radio screen for now */
     FOR_NB_SCREENS(i)
-        fmbars |= VP_SB_IGNORE_SETTING(i);
-    oldbars = viewportmanager_set_statusbar(fmbars);
-    FOR_NB_SCREENS(i)
     {
         viewport_set_defaults(&vp[i], i);
 #ifdef HAVE_BUTTONBAR
@@ -761,14 +757,14 @@ int radio_screen(void)
                 break;
 
             case ACTION_FM_MENU:
-                viewportmanager_set_statusbar(oldbars);
                 FOR_NB_SCREENS(i)
+                {
                     screens[i].scroll_stop(&vp[i]);
+                }
                 radio_menu();
                 curr_preset = find_preset(curr_freq);
-                viewportmanager_set_statusbar(fmbars);
                 FOR_NB_SCREENS(i)
-                {
+                {                
                     screens[i].set_viewport(&vp[i]);
                     screens[i].clear_viewport();
                     screens[i].update_viewport();
@@ -798,9 +794,7 @@ int radio_screen(void)
 
                     break;
                 }
-                viewportmanager_set_statusbar(oldbars);
                 handle_radio_presets();
-                viewportmanager_set_statusbar(fmbars);
                 FOR_NB_SCREENS(i)
                 {
                     screens[i].set_viewport(&vp[i]);
@@ -932,12 +926,9 @@ int radio_screen(void)
                 FOR_NB_SCREENS(i)
                 {
                     screens[i].set_viewport(&vp[i]);
-                    peak_meter_screen(&screens[i],0,
-                                    STATUSBAR_HEIGHT + fh*(top_of_screen + 4),
-                                        fh);
-                    screens[i].update_rect(0,
-                                    STATUSBAR_HEIGHT + fh*(top_of_screen + 4),
-                                        screens[i].getwidth(), fh);
+                    peak_meter_screen(&screens[i],0, fh*(top_of_screen + 4),fh);
+                    screens[i].update_rect(0, fh*(top_of_screen + 4),
+                                           screens[i].getwidth(), fh);
                     screens[i].set_viewport(NULL);
                 }
             }
@@ -1134,8 +1125,9 @@ int radio_screen(void)
     cpu_idle_mode(false);
 #endif
     FOR_NB_SCREENS(i)
+    {
         screens[i].scroll_stop(&vp[i]);
-    viewportmanager_set_statusbar(oldbars);
+    }
     in_screen = false;
 #if CONFIG_CODEC != SWCODEC
     return have_recorded;
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 17c10f7328..0d1ada73f6 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -1019,7 +1019,6 @@ bool recording_screen(bool no_source)
     int peak_l, peak_r;
     int balance = 0;
 #endif
-    int oldbars, recbars = VP_SB_ALLSCREENS;
     int i;
     int pm_x[NB_SCREENS];           /* peakmeter (and trigger bar) x pos */
     int pm_y[NB_SCREENS];           /* peakmeter y pos */
@@ -1082,9 +1081,6 @@ bool recording_screen(bool no_source)
 
     /* viewport init and calculations that only needs to be done once */
     FOR_NB_SCREENS(i)
-        recbars |= VP_SB_IGNORE_SETTING(i);
-    oldbars = viewportmanager_set_statusbar(recbars);
-    FOR_NB_SCREENS(i)
     {
         struct viewport *v;
         /* top vp, 4 lines, force sys font if total screen < 6 lines
@@ -1122,6 +1118,9 @@ bool recording_screen(bool no_source)
     /* init the bottom list */
     gui_synclist_init(&lists, reclist_get_name, NULL, false, 1, vp_list);
     gui_synclist_set_title(&lists, NULL, Icon_NOICON);
+    
+    
+    send_event(GUI_EVENT_ACTIONUPDATE, (void*)1); /* force a redraw */
 
     /* start of the loop: we stay in this loop until user quits recscreen */
     while(done <= 0)
@@ -1576,7 +1575,6 @@ bool recording_screen(bool no_source)
                     /* led is restored at begin of loop / end of function */
                     led(false);
 #endif
-                    viewportmanager_set_statusbar(oldbars);
                     if (recording_menu(no_source))
                     {
                         done = 1;
@@ -1590,7 +1588,6 @@ bool recording_screen(bool no_source)
                         done = -1;
                         /* the init is now done at the beginning of the loop */
                     }
-                    viewportmanager_set_statusbar(recbars);
                 }
                 break;
 
@@ -1602,7 +1599,6 @@ bool recording_screen(bool no_source)
                     /* led is restored at begin of loop / end of function */
                     led(false);
 #endif
-                    viewportmanager_set_statusbar(oldbars);
                     if (f2_rec_screen())
                     {
                         rec_status |= RCSTAT_HAVE_RECORDED;
@@ -1610,7 +1606,6 @@ bool recording_screen(bool no_source)
                     }
                     else
                         update_countdown = 0; /* Update immediately */
-                    viewportmanager_set_statusbar(recbars);
                 }
                 break;
 
@@ -1626,7 +1621,6 @@ bool recording_screen(bool no_source)
                     /* led is restored at begin of loop / end of function */
                     led(false);
 #endif
-                    viewportmanager_set_statusbar(oldbars);
                     if (f3_rec_screen())
                     {
                         rec_status |= RCSTAT_HAVE_RECORDED;
@@ -1634,7 +1628,6 @@ bool recording_screen(bool no_source)
                     }
                     else
                         update_countdown = 0; /* Update immediately */
-                    viewportmanager_set_statusbar(recbars);
                 }
                 break;
 #endif /*  CONFIG_KEYPAD == RECORDER_PAD */
@@ -1920,8 +1913,6 @@ rec_abort:
     FOR_NB_SCREENS(i)
         screens[i].setfont(FONT_UI);
         
-    viewportmanager_set_statusbar(oldbars);
-    send_event(GUI_EVENT_REFRESH, NULL);
 
     /* if the directory was created or recording happened, make sure the
        browser is updated */