6.2.268

   1 To: vim-dev@vim.org
   2 Subject: Patch 6.2.268
   3 Fcc: outbox
   4 From: Bram Moolenaar <Bram@moolenaar.net>
   5 Mime-Version: 1.0
   6 Content-Type: text/plain; charset=ISO-8859-1
   7 Content-Transfer-Encoding: 8bit
   8 ------------
   9
  10 Patch 6.2.268
  11 Problem:    GUI: When changing 'guioptions' part of the window may be off
  12             screen. (Randall Morris)
  13 Solution:   Adjust the size of the window when changing 'guioptions', but only
  14             when adding something.
  15 Files:      src/gui.c
  16
  17
  18 *** ../vim-6.2.267/src/gui.c    Fri Feb  6 19:19:20 2004
  19 --- src/gui.c   Tue Feb 17 16:31:55 2004
  20 ***************
  21 *** 3051,3056 ****
  22 --- 3051,3057 ----
  23   #endif
  24       win_T     *wp;
  25       int               need_set_size;
  26 +     int               fix_size;
  27
  28   #ifdef FEAT_MENU
  29       if (oldval != NULL && gui.in_use)
  30 ***************
  31 *** 3125,3130 ****
  32 --- 3126,3132 ----
  33       if (gui.in_use)
  34       {
  35         need_set_size = FALSE;
  36 +       fix_size = FALSE;
  37         for (i = 0; i < 3; i++)
  38         {
  39             if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
  40 ***************
  41 *** 3140,3145 ****
  42 --- 3142,3149 ----
  43                     }
  44                 }
  45                 need_set_size = TRUE;
  46 +               if (gui.which_scrollbars[i])
  47 +                   fix_size = TRUE;
  48             }
  49             prev_which_scrollbars[i] = gui.which_scrollbars[i];
  50         }
  51 ***************
  52 *** 3150,3155 ****
  53 --- 3154,3161 ----
  54             gui_mch_enable_menu(gui.menu_is_active);
  55             prev_menu_is_active = gui.menu_is_active;
  56             need_set_size = TRUE;
  57 +           if (gui.menu_is_active)
  58 +               fix_size = TRUE;
  59         }
  60   #endif
  61
  62 ***************
  63 *** 3159,3164 ****
  64 --- 3165,3172 ----
  65             gui_mch_show_toolbar(using_toolbar);
  66             prev_toolbar = using_toolbar;
  67             need_set_size = TRUE;
  68 +           if (using_toolbar)
  69 +               fix_size = TRUE;
  70         }
  71   #endif
  72   #ifdef FEAT_FOOTER
  73 ***************
  74 *** 3167,3172 ****
  75 --- 3175,3182 ----
  76             gui_mch_enable_footer(using_footer);
  77             prev_footer = using_footer;
  78             need_set_size = TRUE;
  79 +           if (using_footer)
  80 +               fix_size = TRUE;
  81         }
  82   #endif
  83   #if defined(FEAT_MENU) && !defined(WIN16) && !(defined(WIN3264) && !defined(FEAT_TEAROFF))
  84 ***************
  85 *** 3177,3183 ****
  86         }
  87   #endif
  88         if (need_set_size)
  89 !           gui_set_shellsize(FALSE, FALSE);
  90       }
  91   }
  92
  93 --- 3187,3195 ----
  94         }
  95   #endif
  96         if (need_set_size)
  97 !           /* Adjust the size of the window to avoid that part of our window
  98 !            * is off-screen and a scrollbar can't be used, for example. */
  99 !           gui_set_shellsize(FALSE, fix_size);
 100       }
 101   }
 102
 103 *** ../vim-6.2.267/src/version.c        Tue Feb 17 21:08:58 2004
 104 --- src/version.c       Tue Feb 17 21:30:02 2004
 105 ***************
 106 *** 639,640 ****
 107 --- 639,642 ----
 108   {   /* Add new patch number below this line */
 109 + /**/
 110 +     268,
 111   /**/
 112
 113 --
 114 hundred-and-one symptoms of being an internet addict:
 115 171. You invent another person and chat with yourself in empty chat rooms.
 116
 117  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
 118 ///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
 119 \\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 120  \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///