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 f56461d3c9c7c4fc0e98e69142be14ae53b6a1c8..273e84b2aa55877e68336a7859181393089db0c1 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -548,6 +548,8 @@ void mutt_reflow_windows (void)
     MuttIndexWindow->col_offset += SidebarWidth;
   }
 #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 39999dc90edf6fd8d17720b265d83bddcc930c12..108e0f5b497a0b12dfea6085da4167ea84de2751 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -2436,7 +2436,6 @@ int mutt_index_menu (void)
       case OP_SIDEBAR_TOGGLE_VISIBLE:
        toggle_option (OPTSIDEBAR);
         mutt_reflow_windows();
-       menu->redraw = REDRAW_FULL;
        break;
 #endif
       default:

diff --git a/init.h b/init.h
index 96a7a839fce807c043f389298b7e0fc32511d7d2..40d07a97c24f4616b438d1531b9c1fe065f6c00e 100644 (file)
--- a/init.h
+++ b/init.h
@@ -63,7 +63,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)
@@ -1006,7 +1006,7 @@ struct option_t MuttVars[] = {
   */
 #endif /* HAVE_GDBM || HAVE_DB4 */
 #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
@@ -2837,7 +2837,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
@@ -2845,7 +2845,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.
@@ -3493,7 +3493,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 1e2d6d632882a9e54c9734ff7e6a9cf5ce30a476..632e1073e79b8d67dbfbf46aeea14163ae2911f5 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -2865,7 +2865,6 @@ search_next:
       case OP_SIDEBAR_TOGGLE_VISIBLE:
        toggle_option (OPTSIDEBAR);
         mutt_reflow_windows();
-       pager_menu->redraw = REDRAW_FULL;
        break;
 #endif