patch 8.0.1278: GUI window always resizes when adding scrollbar
Problem: GUI window always resizes when adding/removing a scrollbar,
toolbar, etc.
Solution: Add the 'k' flag in 'guioptions' to keep the GUI window size and
change the number of lines/columns instead. (Ychin, closes #703)
diff --git a/src/gui.c b/src/gui.c
index 8e48d3c..74e2c83 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -693,7 +693,7 @@
#ifndef FEAT_GUI_GTK
/* 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. */
- gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
+ gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
#endif
#if defined(FEAT_GUI_MOTIF) && defined(FEAT_MENU)
/* Need to set the size of the menubar after all the menus have been
@@ -732,7 +732,7 @@
# endif
/* Now make sure the shell fits on the screen. */
- gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
+ gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
#endif
/* When 'lines' was set while starting up the topframe may have to be
* resized. */
@@ -909,7 +909,7 @@
# endif
gui_mch_set_font(gui.norm_font);
#endif
- gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
+ gui_set_shellsize(TRUE, TRUE, RESIZE_BOTH);
}
return ret;
@@ -1553,10 +1553,12 @@
* Set the size of the Vim shell according to Rows and Columns.
* If "fit_to_display" is TRUE then the size may be reduced to fit the window
* on the screen.
+ * When "mustset" is TRUE the size was set by the user. When FALSE a UI
+ * component was added or removed (e.g., a scrollbar).
*/
void
gui_set_shellsize(
- int mustset UNUSED, /* set by the user */
+ int mustset UNUSED,
int fit_to_display,
int direction) /* RESIZE_HOR, RESIZE_VER */
{
@@ -1580,7 +1582,8 @@
#if defined(MSWIN) || defined(FEAT_GUI_GTK)
/* If not setting to a user specified size and maximized, calculate the
* number of characters that fit in the maximized window. */
- if (!mustset && gui_mch_maximized())
+ if (!mustset && (vim_strchr(p_go, GO_KEEPWINSIZE) != NULL
+ || gui_mch_maximized()))
{
gui_mch_newfont();
return;
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 9be54b9..83b98e1 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -2938,7 +2938,7 @@
if (gui.norm_font != NULL)
{
gui_mch_init_font(p_guifont, FALSE);
- gui_set_shellsize(FALSE, FALSE, RESIZE_BOTH);
+ gui_set_shellsize(TRUE, FALSE, RESIZE_BOTH);
}
}
@@ -4909,8 +4909,9 @@
}
/*
- * Called when the font changed while the window is maximized. Compute the
- * new Rows and Columns. This is like resizing the window.
+ * Called when the font changed while the window is maximized or GO_KEEPWINSIZE
+ * is set. Compute the new Rows and Columns. This is like resizing the
+ * window.
*/
void
gui_mch_newfont(void)
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 67895cc..52cadea 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -3385,8 +3385,9 @@
}
/*
- * Called when the font changed while the window is maximized. Compute the
- * new Rows and Columns. This is like resizing the window.
+ * Called when the font changed while the window is maximized or GO_KEEPWINSIZE
+ * is set. Compute the new Rows and Columns. This is like resizing the
+ * window.
*/
void
gui_mch_newfont(void)
diff --git a/src/option.h b/src/option.h
index 88eadae..f9972f2 100644
--- a/src/option.h
+++ b/src/option.h
@@ -235,7 +235,8 @@
#define GO_TOOLBAR 'T' /* add toolbar */
#define GO_FOOTER 'F' /* add footer */
#define GO_VERTICAL 'v' /* arrange dialog buttons vertically */
-#define GO_ALL "aAbcefFghilmMprtTv" /* all possible flags for 'go' */
+#define GO_KEEPWINSIZE 'k' /* keep GUI window size */
+#define GO_ALL "aAbcefFghilmMprtTvk" /* all possible flags for 'go' */
/* flags for 'comments' option */
#define COM_NEST 'n' /* comments strings nest */
diff --git a/src/version.c b/src/version.c
index b5e4539..bba2938 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1278,
+/**/
1277,
/**/
1276,