Change reflow_windows() to set full redraw.

A full redraw should always be set in this case.  This also enables us
to remove redraw flags for some options.

diff --git a/curs_lib.c b/curs_lib.c
index b006f56eaffc1f30df50c8dd7df47c7d7d019cad..1f29d92028b25049c247597414a7df1d387b1628 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -617,6 +617,8 @@ void mutt_reflow_windows (void)
     }
   }
 #endif
+
+  mutt_set_current_menu_redraw_full ();
 }
 
 int mutt_window_move (mutt_window_t *win, int row, int col)

diff --git a/curs_main.c b/curs_main.c
index f3167cf0190706e484f9cd28d283c2269766d55b..84d61655343f626cf58fad3d4abd495caa0e54ba 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -3205,7 +3205,6 @@ int mutt_index_menu (void)
       case OP_SIDEBAR_TOGGLE_VISIBLE:
        toggle_option (OPTSIDEBAR);
         mutt_reflow_windows();
-       menu->redraw = REDRAW_FULL;
        break;
 
       case OP_SIDEBAR_TOGGLE_VIRTUAL:

diff --git a/init.h b/init.h
index 8581fd8e1ed7d11513650b2cc59690414e57ddf7..d302fa0e55c516f2a98bf93d3e86b5b12a486f70 100644 (file)
--- a/init.h
+++ b/init.h
@@ -50,7 +50,7 @@
 #define R_RESORT_SUB   (1<<3)  /* resort subthreads */
 #define R_RESORT_INIT  (1<<4)  /* resort from scratch */
 #define R_TREE         (1<<5)  /* redraw the thread tree */
-#define R_REFLOW        (1<<6)  /* reflow window layout */
+#define R_REFLOW        (1<<6)  /* reflow window layout and full redraw */
 #define R_SIDEBAR       (1<<7)  /* redraw the sidebar */
 #define R_BOTH         (R_INDEX | R_PAGER)
 #define R_RESORT_BOTH  (R_RESORT | R_RESORT_SUB)
@@ -1112,7 +1112,7 @@ struct option_t MuttVars[] = {
   */
 #endif /* HAVE_GDBM || HAVE_BDB */
 #endif /* USE_HCACHE */
-  { "help",            DT_BOOL, R_BOTH|R_REFLOW, OPTHELP, 1 },
+  { "help",            DT_BOOL, R_REFLOW, OPTHELP, 1 },
   /*
   ** .pp
   ** When \fIset\fP, help lines describing the bindings for the major functions
@@ -3245,7 +3245,7 @@ struct option_t MuttVars[] = {
   ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
   ** order (example: ``\fCset sort_browser=reverse-date\fP'').
   */
-  { "sidebar_visible", DT_BOOL, R_BOTH|R_REFLOW, OPTSIDEBAR, 0 },
+  { "sidebar_visible", DT_BOOL, R_REFLOW, OPTSIDEBAR, 0 },
   /*
   ** .pp
   ** This specifies whether or not to show sidebar. The sidebar shows a list of
@@ -3253,7 +3253,7 @@ struct option_t MuttVars[] = {
   ** .pp
   ** \fBSee also:\fP $$sidebar_format, $$sidebar_width
   */
-  { "sidebar_width", DT_NUM, R_BOTH|R_REFLOW, UL &SidebarWidth, 30 },
+  { "sidebar_width", DT_NUM, R_REFLOW, UL &SidebarWidth, 30 },
   /*
   ** .pp
   ** This controls the width of the sidebar.  It is measured in screen columns.
@@ -3925,7 +3925,7 @@ struct option_t MuttVars[] = {
   ** will replace any dots in the expansion by underscores. This might be helpful
   ** with IMAP folders that don't like dots in folder names.
   */
-  { "status_on_top",   DT_BOOL, R_BOTH|R_REFLOW, OPTSTATUSONTOP, 0 },
+  { "status_on_top",   DT_BOOL, R_REFLOW, OPTSTATUSONTOP, 0 },
   /*
   ** .pp
   ** Setting this variable causes the ``status bar'' to be displayed on

diff --git a/pager.c b/pager.c
index 658b67d884064f31479616eab5f2a564f87257cf..2f47215641308e7d2df45384e457479d38080dbd 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -3109,7 +3109,6 @@ search_next:
       case OP_SIDEBAR_TOGGLE_VISIBLE:
        toggle_option (OPTSIDEBAR);
         mutt_reflow_windows();
-       pager_menu->redraw = REDRAW_FULL;
        break;
 #endif