summaryrefslogtreecommitdiff
path: root/src/gui_w32.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-03-24 17:57:12 +0100
committerBram Moolenaar <Bram@vim.org>2015-03-24 17:57:12 +0100
commit71371b15794941dbeb01e46827d6d501dc95acbd (patch)
tree483c4fbb5b6f93bff58918c66e05e454aea92d1f /src/gui_w32.c
parent310f2d59b2b20c642088feb5e6dfe323cc570923 (diff)
downloadvim-git-71371b15794941dbeb01e46827d6d501dc95acbd.tar.gz
updated for version 7.4.681v7.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)
Diffstat (limited to 'src/gui_w32.c')
-rw-r--r--src/gui_w32.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c
index b81a74df9..4fbf70edc 100644
--- 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;
}