changeset 6714:dc96dd80aef8 v7.4.681

updated for version 7.4.681 Problem: MS-Windows: When Vim is minimized the window height is computed incorrectly. Solution: When minimized use the previously computed size. (Ingo Karkat)
author Bram Moolenaar <bram@vim.org>
date Tue, 24 Mar 2015 17:57:12 +0100
parents e544e57681f0
children f9e3d6dcccff
files src/gui_w32.c src/version.c
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -598,6 +598,14 @@ gui_mswin_get_menu_height(
 
     if (num == 0)
 	menu_height = 0;
+    else if (IsMinimized(s_hwnd))
+    {
+	/* The height of the menu cannot be determined while the window is
+	 * minimized.  Take the previous height if the menu is changed in that
+	 * state, to avoid that Vim's vertical window size accidentally
+	 * increases due to the unaccounted-for menu height. */
+	menu_height = old_menu_height == -1 ? 0 : old_menu_height;
+    }
     else
     {
 	if (is_winnt_3())	/* for NT 3.xx */
@@ -644,9 +652,9 @@ gui_mswin_get_menu_height(
 
     if (fix_window && menu_height != old_menu_height)
     {
-	old_menu_height = menu_height;
 	gui_set_shellsize(FALSE, FALSE, RESIZE_VERT);
     }
+    old_menu_height = menu_height;
 
     return menu_height;
 }
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    681,
+/**/
     680,
 /**/
     679,