Nico Golde:

  sidebar looks no longer broken in the pager view.

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@100 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/ChangeLog.mutt-ng b/ChangeLog.mutt-ng
index d8de501..c0181c2 100644 (file)
--- a/ChangeLog.mutt-ng
+++ b/ChangeLog.mutt-ng
@@ -1,5 +1,8 @@
 Changes specific to mutt-ng:
 
 Changes specific to mutt-ng:
 

+2005-02-27
+  * makes sidebar fit into screen in the pager
+

 2005-02-27
   * integrated patch to highlight the next mailbox which includes new mail in
   sidebar
 2005-02-27
   * integrated patch to highlight the next mailbox which includes new mail in
   sidebar

diff --git a/muttlib.c b/muttlib.c
index 4beb99c..b7bba57 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -1029,7 +1029,7 @@ void mutt_FormatString (char *dest,               /* output buffer */
        if ( DrawFullLine )
          count = (COLS < destlen ? COLS : destlen);
        else
        if ( DrawFullLine )
          count = (COLS < destlen ? COLS : destlen);
        else

-         count = ((COLS-SidebarWidth) < destlen ? (COLS - SidebarWidth) : destlen);
+         count = ((COLS) < destlen ? (COLS) : destlen);

        if (count > col)
        {
          count -= col; /* how many columns left on this line */
        if (count > col)
        {
          count -= col; /* how many columns left on this line */

diff --git a/pager.c b/pager.c
index 58e0e2a..312e8e1 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -1776,9 +1776,9 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
       draw_sidebar(MENU_PAGER);
       /* print out the index status bar */
       menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));
       draw_sidebar(MENU_PAGER);
       /* print out the index status bar */
       menu_status_line (buffer, sizeof (buffer), index, NONULL(Status));

-      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),SidebarWidth);
+      move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),0);

       SETCOLOR (MT_COLOR_STATUS);
       SETCOLOR (MT_COLOR_STATUS);

-      mutt_paddstr (COLS-SidebarWidth, buffer);
+      mutt_paddstr (COLS, buffer);

       SETCOLOR (MT_COLOR_NORMAL);
     }
        /* if we're not using the index, update every time */
       SETCOLOR (MT_COLOR_NORMAL);
     }
        /* if we're not using the index, update every time */