aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.1092: setting 'guifont' when maximized resizes the Vim window

Browse Source 
Problem:    Setting 'guifont' when maximized resizes the Vim window. When
            'guioptions' contains "k" gvim may open with a tiny window.
Solution:   Avoid un-maximizing when setting 'guifont'. (Yee Cheng Chin,
            closes #3808)
This commit is contained in:
Bram Moolenaar
2019-03-30 20:31:22 +01:00
parent f0908e6fe1
commit 372674fca3
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui.c
View File

@@ -681,8 +681,13 @@ gui_init(void)
#ifndef FEAT_GUI_GTK #ifndef FEAT_GUI_GTK
// Set the shell size, adjusted for the screen size. For GTK this only // Set the shell size, adjusted for the screen size. For GTK this only
// works after the shell has been opened, thus it is further down. // works after the shell has been opened, thus it is further down.
// For MS-Windows pass FALSE for "mustset" to make --windowid work. // If the window is already maximized (e.g. when --windowid is passed in),
// we want to use the system-provided dimensions by passing FALSE to
// mustset. Otherwise, we want to initialize with the default rows/columns.
if (gui_mch_maximized())
gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH); gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
else
gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
#endif #endif
#if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU) #if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU)
/* Need to set the size of the menubar after all the menus have been /* Need to set the size of the menubar after all the menus have been
@@ -721,6 +726,9 @@ gui_init(void)
# endif # endif
/* Now make sure the shell fits on the screen. */ /* Now make sure the shell fits on the screen. */
if (gui_mch_maximized())
gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
else
gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH); gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
#endif #endif
/* When 'lines' was set while starting up the topframe may have to be /* When 'lines' was set while starting up the topframe may have to be
@@ -906,7 +914,7 @@ gui_init_font(char_u *font_list, int fontset UNUSED)
# endif # endif
gui_mch_set_font(gui.norm_font); gui_mch_set_font(gui.norm_font);
#endif #endif
gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH); gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
} }
return ret; return ret;

2
src/version.c
View File

@@ -775,6 +775,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 */
/**/
1092,
/**/ /**/
1091, 1091,
/**/ /**/