Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-29 05:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USER32][WIN32SS] Improve CascadeWindows function (#677)

Browse source 
If the window is too large, then shrink it if possible.
CORE-14807
This commit is contained in:
Katayama Hirofumi MZ 2018-07-09 21:52:30 +09:00 committed by Hermès BÉLUSCA - MAÏTO
parent 506bd64e44
commit cc3ba6e41c
1 changed files with 51 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
win32ss/user/user32/windows/mdi.c
View file

@ -2047,6 +2047,22 @@ GetCascadeChildProc(HWND hwnd, LPARAM lParam)
return TRUE; return TRUE;
} }
static void
QuerySizeFix(HWND hwnd, LPINT pcx, LPINT pcy)
{
MINMAXINFO mmi;
DWORD_PTR dwResult;
mmi.ptMinTrackSize.x = mmi.ptMinTrackSize.y = 0;
mmi.ptMaxTrackSize.x = mmi.ptMaxTrackSize.y = MAXLONG;
if (SendMessageTimeoutW(hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&mmi,
SMTO_ABORTIFHUNG | SMTO_NORMAL, 120, &dwResult))
{
*pcx = min(max(*pcx, mmi.ptMinTrackSize.x), mmi.ptMaxTrackSize.x);
*pcy = min(max(*pcy, mmi.ptMinTrackSize.y), mmi.ptMaxTrackSize.y);
}
}
WORD WINAPI WORD WINAPI
CascadeWindows(HWND hwndParent, UINT wFlags, LPCRECT lpRect, CascadeWindows(HWND hwndParent, UINT wFlags, LPCRECT lpRect,
UINT cKids, const HWND *lpKids) UINT cKids, const HWND *lpKids)
@ -2057,8 +2073,9 @@ CascadeWindows(HWND hwndParent, UINT wFlags, LPCRECT lpRect,
MONITORINFO mi; MONITORINFO mi;
RECT rcWork, rcWnd; RECT rcWork, rcWnd;
DWORD i, ret = 0; DWORD i, ret = 0;
INT x, y, cx, cy, dx, dy; INT x, y, cx, cy, cxNew, cyNew, cxWork, cyWork, dx, dy;
HDWP hDWP; HDWP hDWP;
POINT pt;
TRACE("(%p,0x%08x,...,%u,...)\n", hwndParent, wFlags, cKids); TRACE("(%p,0x%08x,...,%u,...)\n", hwndParent, wFlags, cKids);
@ -2098,7 +2115,8 @@ CascadeWindows(HWND hwndParent, UINT wFlags, LPCRECT lpRect,
} }
else else
{ {
hMon = MonitorFromWindow(hwndParent, MONITOR_DEFAULTTONEAREST); pt.x = pt.y = 0;
hMon = MonitorFromPoint(pt, MONITOR_DEFAULTTOPRIMARY);
mi.cbSize = sizeof(mi); mi.cbSize = sizeof(mi);
GetMonitorInfoW(hMon, &mi); GetMonitorInfoW(hMon, &mi);
rcWork = mi.rcWork; rcWork = mi.rcWork;
@ -2112,30 +2130,49 @@ CascadeWindows(HWND hwndParent, UINT wFlags, LPCRECT lpRect,
y = rcWork.top; y = rcWork.top;
dx = GetSystemMetrics(SM_CXSIZEFRAME) + GetSystemMetrics(SM_CXSIZE); dx = GetSystemMetrics(SM_CXSIZEFRAME) + GetSystemMetrics(SM_CXSIZE);
dy = GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYSIZE); dy = GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYSIZE);
cxWork = rcWork.right - rcWork.left;
cyWork = rcWork.bottom - rcWork.top;
hwndPrev = NULL; hwndPrev = NULL;
for (i = info.chwnd; i > 0;) /* in reverse order */ for (i = info.chwnd; i > 0;) /* in reverse order */
{ {
--i; --i;
hwnd = info.ahwnd[i]; hwnd = info.ahwnd[i];
if (IsZoomed(hwnd))
ShowWindow(hwnd, SW_RESTORE | SW_SHOWNA);
GetWindowRect(hwnd, &rcWnd);
cx = rcWnd.right - rcWnd.left;
cy = rcWnd.bottom - rcWnd.top;
if (x + cx > rcWork.right)
x = rcWork.left;
if (y + cy > rcWork.bottom)
y = rcWork.top;
if (!IsWindowVisible(hwnd) || IsIconic(hwnd)) if (!IsWindowVisible(hwnd) || IsIconic(hwnd))
continue; continue;
if ((info.wFlags & MDITILE_SKIPDISABLED) && !IsWindowEnabled(hwnd)) if ((info.wFlags & MDITILE_SKIPDISABLED) && !IsWindowEnabled(hwnd))
continue; continue;
if (IsZoomed(hwnd))
ShowWindow(hwnd, SW_RESTORE | SW_SHOWNA);
GetWindowRect(hwnd, &rcWnd);
cxNew = cx = rcWnd.right - rcWnd.left;
cyNew = cy = rcWnd.bottom - rcWnd.top;
/* if we can change the window size and it is not only one */
if (info.chwnd != 1 && (GetWindowLongPtrW(hwnd, GWL_STYLE) & WS_THICKFRAME))
{
/* check the size */
#define THRESHOLD(xy) (((xy) * 5) / 7) /* in the rate 5/7 */
cxNew = min(cxNew, THRESHOLD(cxWork));
cyNew = min(cyNew, THRESHOLD(cyWork));
#undef THRESHOLD
if (cx != cxNew || cy != cyNew)
{
/* too large. shrink if we can */
QuerySizeFix(hwnd, &cxNew, &cyNew);
cx = cxNew;
cy = cyNew;
}
}
if (x + cx > rcWork.right)
x = rcWork.left;
if (y + cy > rcWork.bottom)
y = rcWork.top;
hDWP = DeferWindowPos(hDWP, hwnd, HWND_TOP, x, y, cx, cy, SWP_NOACTIVATE); hDWP = DeferWindowPos(hDWP, hwnd, HWND_TOP, x, y, cx, cy, SWP_NOACTIVATE);
if (hDWP == NULL) if (hDWP == NULL)
{ {