X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fmenu.c;h=0a1d716d17377249b5fdb7ad8d33e1fd7e5d1f30;hb=5dcac54e5db074dc4572f843666c7f7acaf2d109;hp=9bd9e7ba257ecf8bd35c8ba0ea21d4fba9f0abdd;hpb=8e39affbf1cd8a2a5ff5c9991650d54fdcea4997;p=apps%2Fmadmutt.git

diff --git a/lib-ui/menu.c b/lib-ui/menu.c
index 9bd9e7b..0a1d716 100644
--- a/lib-ui/menu.c
+++ b/lib-ui/menu.c
@@ -7,9 +7,8 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <lib-lib/lib-lib.h>
+#include <lib-ui/lib-ui.h>
 
-#include "curses.h"
 #include "enter.h"
 #include "menu.h"
 
@@ -119,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;
@@ -149,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)
@@ -748,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)