mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
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)
This commit is contained in:
@@ -3335,17 +3335,30 @@ gui_mch_newfont()
|
||||
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
|
||||
);
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
874,
|
||||
/**/
|
||||
873,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user