Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 02:26:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32SS:NTUSER] restore snapped window to normal size by dragging window caption

Browse source 
CORE-15638
This commit is contained in:
Denis Malikov 2021-11-20 16:58:24 +07:00 • committed by Victor Perevertkin
parent 8d5011fb6b
commit 669b2f4465
1 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

39
win32ss/user/ntuser/nonclient.c
View file

@ -263,7 +263,7 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam)
ExStyle = pwnd->ExStyle; ExStyle = pwnd->ExStyle;
iconic = (Style & WS_MINIMIZE) != 0; iconic = (Style & WS_MINIMIZE) != 0;
if ((Style & WS_MAXIMIZE) || !IntIsWindowVisible(pwnd)) return; if (((Style & WS_MAXIMIZE) && syscommand != SC_MOVE) || !IntIsWindowVisible(pwnd)) return;
thickframe = UserHasThickFrameStyle(Style, ExStyle) && !iconic; thickframe = UserHasThickFrameStyle(Style, ExStyle) && !iconic;
@ -511,7 +511,40 @@ DefWndDoSizeMove(PWND pwnd, WORD wParam)
RECT newRect = unmodRect; RECT newRect = unmodRect;
if (!iconic && !DragFullWindows) UserDrawMovingFrame( hdc, &sizingRect, thickframe ); if (!iconic && !DragFullWindows) UserDrawMovingFrame( hdc, &sizingRect, thickframe );
if (hittest == HTCAPTION) RECTL_vOffsetRect( &newRect, dx, dy ); if (hittest == HTCAPTION)
{
/* Restore window size if it is snapped */
if (!RECTL_bIsEmptyRect(&pwnd->InternalPos.NormalRect) &&
!IntEqualRect(&pwnd->InternalPos.NormalRect, &pwnd->rcWindow))
{
UserSetCursorPos(max(0, pwnd->InternalPos.NormalRect.left) + pt.x, pwnd->InternalPos.NormalRect.top + pt.y, 0, 0, FALSE);
/* Save normal size - it required when window unsnapped from one side and snapped to another holding mouse down */
origRect = pwnd->InternalPos.NormalRect;
/* Restore from maximized state */
if (Style & WS_MAXIMIZE)
{
co_IntSendMessage(UserHMGetHandle(pwnd), WM_SYSCOMMAND, SC_RESTORE, 0);
}
/* Restore snapped to left/right place */
else
{
co_WinPosSetWindowPos(pwnd,
NULL,
pwnd->InternalPos.NormalRect.left,
pwnd->InternalPos.NormalRect.top,
pwnd->InternalPos.NormalRect.right - pwnd->InternalPos.NormalRect.left,
pwnd->InternalPos.NormalRect.bottom - pwnd->InternalPos.NormalRect.top,
0);
}
RECTL_vSetEmptyRect(&pwnd->InternalPos.NormalRect);
continue;
}
/* regular window moving */
RECTL_vOffsetRect(&newRect, dx, dy);
}
if (ON_LEFT_BORDER(hittest)) newRect.left += dx; if (ON_LEFT_BORDER(hittest)) newRect.left += dx;
else if (ON_RIGHT_BORDER(hittest)) newRect.right += dx; else if (ON_RIGHT_BORDER(hittest)) newRect.right += dx;
if (ON_TOP_BORDER(hittest)) newRect.top += dy; if (ON_TOP_BORDER(hittest)) newRect.top += dy;
@ -1648,7 +1681,7 @@ NC_HandleNCLButtonDblClk(PWND pWnd, WPARAM wParam, LPARAM lParam)
UserSystemParametersInfo(SPI_GETWORKAREA, 0, &mouseRect, 0); UserSystemParametersInfo(SPI_GETWORKAREA, 0, &mouseRect, 0);
co_WinPosSetWindowPos(pWnd, co_WinPosSetWindowPos(pWnd,
0, NULL,
sizingRect.left, sizingRect.left,
mouseRect.top, mouseRect.top,
sizingRect.right - sizingRect.left, sizingRect.right - sizingRect.left,