[WIN32SS:NTUSER] Fix Window-snap madness (#1246)

Desktop window was treated as possible to resize.
Fix for 7e396787

CORE-15624
This commit is contained in:
Denis Malikov 2019-01-20 05:05:19 +07:00 committed by Hermès BÉLUSCA - MAÏTO
parent d893a6c355
commit 37af78775d
2 changed files with 10 additions and 1 deletions

View file

@ -787,6 +787,11 @@ IntDefWindowProc(
PWND topWnd = UserGetWindowObject(hwndTop); PWND topWnd = UserGetWindowObject(hwndTop);
if (topWnd) if (topWnd)
{ {
if ((topWnd->style & WS_THICKFRAME) == 0)
{
return 0;
}
if (wParam == VK_DOWN) if (wParam == VK_DOWN)
{ {
if (topWnd->style & WS_MAXIMIZE) if (topWnd->style & WS_MAXIMIZE)

View file

@ -395,7 +395,7 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam)
if (msg.message == WM_LBUTTONUP) if (msg.message == WM_LBUTTONUP)
{ {
// check for snapping if was moved by caption // check for snapping if was moved by caption
if (hittest == HTCAPTION) if (hittest == HTCAPTION && thickframe && (ExStyle & WS_EX_MDICHILD) == 0)
{ {
RECT snapRect; RECT snapRect;
BOOL doSideSnap = FALSE; BOOL doSideSnap = FALSE;
@ -1618,6 +1618,10 @@ NC_HandleNCLButtonDblClk(PWND pWnd, WPARAM wParam, LPARAM lParam)
case HTBOTTOM: case HTBOTTOM:
{ {
RECT sizingRect = pWnd->rcWindow, mouseRect; RECT sizingRect = pWnd->rcWindow, mouseRect;
if (pWnd->ExStyle & WS_EX_MDICHILD)
break;
UserSystemParametersInfo(SPI_GETWORKAREA, 0, &mouseRect, 0); UserSystemParametersInfo(SPI_GETWORKAREA, 0, &mouseRect, 0);
co_WinPosSetWindowPos(pWnd, co_WinPosSetWindowPos(pWnd,