Make the sidebar live in a proper independent window.

[apps/madmutt.git] / lib-ui / menu.c

diff --git a/lib-ui/menu.c b/lib-ui/menu.c
index 0371dbc..0a1d716 100644 (file)
--- a/lib-ui/menu.c
+++ b/lib-ui/menu.c
@@ -118,21 +118,12 @@ void menu_redraw_full (MUTTMENU * menu)
   wmove (stdscr, 0, 0);
   wclrtobot (stdscr);
 
-  if (option (OPTHELP)) {
-    SETCOLOR (MT_COLOR_STATUS);
-    wmove (stdscr, option (OPTSTATUSONTOP) ? LINES - 2 : 0, SW);
-    mutt_paddstr (COLS-SW, "");
-    SETCOLOR (MT_COLOR_NORMAL);
-    menu->offset = 1;
-    menu->pagelen = LINES - 3;
-  }
-  else {
-    menu->offset = option (OPTSTATUSONTOP) ? 1 : 0;
-    menu->pagelen = LINES - 2;
-  }
-
-  sidebar_draw_frames();
-
+  SETCOLOR (MT_COLOR_STATUS);
+  wmove (stdscr, option (OPTSTATUSONTOP) ? LINES - 2 : 0, SW);
+  mutt_paddstr (COLS-SW, "");
+  SETCOLOR (MT_COLOR_NORMAL);
+  menu->offset = 1;
+  menu->pagelen = LINES - 3;
   mutt_show_error ();
 
   menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
@@ -148,7 +139,6 @@ void menu_redraw_status (MUTTMENU * menu)
   mutt_paddstr (COLS-SW, buf);
   SETCOLOR (MT_COLOR_NORMAL);
   menu->redraw &= ~REDRAW_STATUS;
-  sidebar_draw_frames();
 }
 
 void menu_redraw_index (MUTTMENU * menu)
@@ -747,10 +737,8 @@ int mutt_menuLoop (MUTTMENU * menu)
     mutt_curs_set (1);
 
     if (SigWinch) {
-      mutt_resize_screen ();
+      ui_layout_resize();
       menu->redraw = REDRAW_FULL;
-      SigWinch = 0;
-      clearok (stdscr, TRUE);   /*force complete redraw */
     }
 
     if (i == -1)