aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 7.4.874

Browse Source 
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:
Bram Moolenaar
2015-09-25 15:00:31 +02:00
parent b8603882b1
commit 8919554fe1
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gui_w48.c
View File

@@ -3335,17 +3335,30 @@ gui_mch_newfont()
RECT rect; RECT rect;
GetWindowRect(s_hwnd, &rect); GetWindowRect(s_hwnd, &rect);
gui_resize_shell(rect.right - rect.left if (win_socket_id == 0)
- (GetSystemMetrics(SM_CXFRAME) + {
GetSystemMetrics(SM_CXPADDEDBORDER)) * 2, gui_resize_shell(rect.right - rect.left
rect.bottom - rect.top - (GetSystemMetrics(SM_CXFRAME) +
- (GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CXPADDEDBORDER)) * 2,
GetSystemMetrics(SM_CXPADDEDBORDER)) * 2 rect.bottom - rect.top
- GetSystemMetrics(SM_CYCAPTION) - (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 #ifdef FEAT_MENU
- gui_mswin_get_menu_height(FALSE) - gui_mswin_get_menu_height(FALSE)
#endif #endif
); );
}
} }
/* /*

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
874,
/**/ /**/
873, 873,
/**/ /**/