mirror of
https://github.com/vim/vim.git
synced 2025-08-23 19:34:27 -04:00
updated for version 7.4b.001
Problem: Win32: dialog may extend off-screen. Solution: Reduce the size, use correct borders. (Andrei Olsen)
This commit is contained in:
parent
1a42b4befb
commit
1b1b09449f
@ -3179,12 +3179,14 @@ gui_mch_dialog(
|
|||||||
maxDialogWidth = workarea_rect.right - workarea_rect.left - 100;
|
maxDialogWidth = workarea_rect.right - workarea_rect.left - 100;
|
||||||
if (maxDialogWidth > 600)
|
if (maxDialogWidth > 600)
|
||||||
maxDialogWidth = 600;
|
maxDialogWidth = 600;
|
||||||
maxDialogHeight = workarea_rect.bottom - workarea_rect.top - 100;
|
/* Leave some room for the taskbar. */
|
||||||
|
maxDialogHeight = workarea_rect.bottom - workarea_rect.top - 150;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Use our own window for the size, unless it's very small. */
|
/* Use our own window's client area for the size, unless it's very
|
||||||
GetWindowRect(s_hwnd, &rect);
|
* small. */
|
||||||
|
GetClientRect(s_hwnd, &rect);
|
||||||
maxDialogWidth = rect.right - rect.left
|
maxDialogWidth = rect.right - rect.left
|
||||||
- (GetSystemMetrics(SM_CXFRAME) +
|
- (GetSystemMetrics(SM_CXFRAME) +
|
||||||
GetSystemMetrics(SM_CXPADDEDBORDER)) * 2;
|
GetSystemMetrics(SM_CXPADDEDBORDER)) * 2;
|
||||||
@ -3192,8 +3194,8 @@ gui_mch_dialog(
|
|||||||
maxDialogWidth = DLG_MIN_MAX_WIDTH;
|
maxDialogWidth = DLG_MIN_MAX_WIDTH;
|
||||||
|
|
||||||
maxDialogHeight = rect.bottom - rect.top
|
maxDialogHeight = rect.bottom - rect.top
|
||||||
- (GetSystemMetrics(SM_CXFRAME) +
|
- (GetSystemMetrics(SM_CYFRAME) +
|
||||||
GetSystemMetrics(SM_CXPADDEDBORDER)) * 2;
|
GetSystemMetrics(SM_CXPADDEDBORDER)) * 4;
|
||||||
if (maxDialogHeight < DLG_MIN_MAX_HEIGHT)
|
if (maxDialogHeight < DLG_MIN_MAX_HEIGHT)
|
||||||
maxDialogHeight = DLG_MIN_MAX_HEIGHT;
|
maxDialogHeight = DLG_MIN_MAX_HEIGHT;
|
||||||
}
|
}
|
||||||
|
@ -727,6 +727,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 */
|
||||||
|
/**/
|
||||||
|
1,
|
||||||
/**/
|
/**/
|
||||||
0
|
0
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user