diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-03-24 17:57:12 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-03-24 17:57:12 +0100 |
| commit | 71371b15794941dbeb01e46827d6d501dc95acbd (patch) | |
| tree | 483c4fbb5b6f93bff58918c66e05e454aea92d1f | |
| parent | 310f2d59b2b20c642088feb5e6dfe323cc570923 (diff) | |
| download | vim-git-7.4.681.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)
| -rw-r--r-- | src/gui_w32.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 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; } diff --git a/src/version.c b/src/version.c index b08c010fa..7ef360739 100644 --- 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, |