patch 7.4.874
Problem: MS-Windows: When Vim runs inside another application, the size
isn't right.
Solution: When in child mode compute the size differently. (Agorgianitis
Loukas)
diff --git a/src/gui_w48.c b/src/gui_w48.c
index bff67a8..ef288e1 100644
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -3335,17 +3335,30 @@
RECT rect;
GetWindowRect(s_hwnd, &rect);
- gui_resize_shell(rect.right - rect.left
- - (GetSystemMetrics(SM_CXFRAME) +
- GetSystemMetrics(SM_CXPADDEDBORDER)) * 2,
- rect.bottom - rect.top
- - (GetSystemMetrics(SM_CYFRAME) +
- GetSystemMetrics(SM_CXPADDEDBORDER)) * 2
- - GetSystemMetrics(SM_CYCAPTION)
+ if (win_socket_id == 0)
+ {
+ gui_resize_shell(rect.right - rect.left
+ - (GetSystemMetrics(SM_CXFRAME) +
+ GetSystemMetrics(SM_CXPADDEDBORDER)) * 2,
+ rect.bottom - rect.top
+ - (GetSystemMetrics(SM_CYFRAME) +
+ GetSystemMetrics(SM_CXPADDEDBORDER)) * 2
+ - GetSystemMetrics(SM_CYCAPTION)
+#ifdef FEAT_MENU
+ - gui_mswin_get_menu_height(FALSE)
+#endif
+ );
+ }
+ else
+ {
+ /* Inside another window, don't use the frame and border. */
+ gui_resize_shell(rect.right - rect.left,
+ rect.bottom - rect.top
#ifdef FEAT_MENU
- gui_mswin_get_menu_height(FALSE)
#endif
- );
+ );
+ }
}
/*
diff --git a/src/version.c b/src/version.c
index 9bbe042..f8fe4a8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 874,
+/**/
873,
/**/
872,
