aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.2-065

Browse Source
This commit is contained in:
Bram Moolenaar 2008-12-03 17:50:45 +00:00
parent 555b3d5aba
commit 0133bba301
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui.c
View File

@ -3241,7 +3241,7 @@ gui_init_which_components(oldval)
i = Rows; i = Rows;
gui_update_tabline(); gui_update_tabline();
Rows = i; Rows = i;
need_set_size = RESIZE_VERT; need_set_size |= RESIZE_VERT;
if (using_tabline) if (using_tabline)
fix_size = TRUE; fix_size = TRUE;
if (!gui_use_tabline()) if (!gui_use_tabline())
@ -3275,9 +3275,9 @@ gui_init_which_components(oldval)
if (gui.which_scrollbars[i] != prev_which_scrollbars[i]) if (gui.which_scrollbars[i] != prev_which_scrollbars[i])
{ {
if (i == SBAR_BOTTOM) if (i == SBAR_BOTTOM)
need_set_size = RESIZE_VERT; need_set_size |= RESIZE_VERT;
else else
need_set_size = RESIZE_HOR; need_set_size |= RESIZE_HOR;
if (gui.which_scrollbars[i]) if (gui.which_scrollbars[i])
fix_size = TRUE; fix_size = TRUE;
} }
@ -3297,7 +3297,7 @@ gui_init_which_components(oldval)
gui_mch_enable_menu(gui.menu_is_active); gui_mch_enable_menu(gui.menu_is_active);
Rows = i; Rows = i;
prev_menu_is_active = gui.menu_is_active; prev_menu_is_active = gui.menu_is_active;
need_set_size = RESIZE_VERT; need_set_size |= RESIZE_VERT;
if (gui.menu_is_active) if (gui.menu_is_active)
fix_size = TRUE; fix_size = TRUE;
} }
@ -3308,7 +3308,7 @@ gui_init_which_components(oldval)
{ {
gui_mch_show_toolbar(using_toolbar); gui_mch_show_toolbar(using_toolbar);
prev_toolbar = using_toolbar; prev_toolbar = using_toolbar;
need_set_size = RESIZE_VERT; need_set_size |= RESIZE_VERT;
if (using_toolbar) if (using_toolbar)
fix_size = TRUE; fix_size = TRUE;
} }
@ -3318,7 +3318,7 @@ gui_init_which_components(oldval)
{ {
gui_mch_enable_footer(using_footer); gui_mch_enable_footer(using_footer);
prev_footer = using_footer; prev_footer = using_footer;
need_set_size = RESIZE_VERT; need_set_size |= RESIZE_VERT;
if (using_footer) if (using_footer)
fix_size = TRUE; fix_size = TRUE;
} }
@ -3330,10 +3330,11 @@ gui_init_which_components(oldval)
prev_tearoff = using_tearoff; prev_tearoff = using_tearoff;
} }
#endif #endif
if (need_set_size) if (need_set_size != 0)
{ {
#ifdef FEAT_GUI_GTK #ifdef FEAT_GUI_GTK
long c = Columns; long prev_Columns = Columns;
long prev_Rows = Rows;
#endif #endif
/* Adjust the size of the window to make the text area keep the /* Adjust the size of the window to make the text area keep the
* same size and to avoid that part of our window is off-screen * same size and to avoid that part of our window is off-screen
@ -3349,11 +3350,14 @@ gui_init_which_components(oldval)
* If you remove this, please test this command for resizing * If you remove this, please test this command for resizing
* effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q". * effects (with optional left scrollbar): ":vsp|q|vsp|q|vsp|q".
* Don't do this while starting up though. * Don't do this while starting up though.
* And don't change Rows, it may have be reduced intentionally * Don't change Rows when adding menu/toolbar/tabline.
* when adding menu/toolbar/tabline. */ * Don't change Columns when adding vertical toolbar. */
if (!gui.starting) if (!gui.starting && need_set_size != (RESIZE_VERT | RESIZE_HOR))
(void)char_avail(); (void)char_avail();
Columns = c; if ((need_set_size & RESIZE_VERT) == 0)
Rows = prev_Rows;
if ((need_set_size & RESIZE_HOR) == 0)
Columns = prev_Columns;
#endif #endif
} }
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS

2
src/version.c
View File

@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
65,
/**/ /**/
64, 64,
/**/ /**/