Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-27 21:22:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Proper implementation of NtUserMoveWindow()

Browse source 
svn path=/trunk/; revision=4420
This commit is contained in:
Richard Campbell 2003-03-24 01:36:10 +00:00
parent 1c607fc7d1
commit e93115c5a2
1 changed files with 57 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

67
reactos/subsys/win32k/ntuser/window.c
View file

@ -1,4 +1,4 @@
/* $Id: window.c,v 1.37 2003/03/22 04:53:01 rcampbell Exp $ /* $Id: window.c,v 1.38 2003/03/24 01:36:10 rcampbell Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -843,21 +843,55 @@ NtUserMoveWindow(
{ {
PWINDOW_OBJECT Window = W32kGetWindowObject(hWnd); PWINDOW_OBJECT Window = W32kGetWindowObject(hWnd);
ULONG uStyle, uExStyle; ULONG uStyle, uExStyle;
if (!Window) WINDOWPOS pWinPos;
{
return FALSE; if (!Window) return FALSE;
}
uStyle = Window->Style; uStyle = Window->Style;
uExStyle = Window->ExStyle; uExStyle = Window->ExStyle;
pWinPos.hwnd = hWnd;
/* FIXME: Is this the correct behavior? */
if (X) if (X)
Window->WindowRect.left = X; {
pWinPos.x = X;
}
else
{
pWinPos.x = Window->WindowRect.left;
}
if (Y) if (Y)
Window->WindowRect.top = Y; {
pWinPos.y = Y;
}
else
{
pWinPos.y = Window->WindowRect.top;
}
if (nWidth) if (nWidth)
Window->WindowRect.right = Window->WindowRect.left + nWidth; {
pWinPos.cx = pWinPos.x + nWidth;
}
else
{
pWinPos.cx = pWinPos.x + (Window->WindowRect.right - Window->WindowRect.left);
}
if (nHeight) if (nHeight)
Window->WindowRect.bottom = Window->WindowRect.top + nHeight; {
Window->ClientRect = Window->WindowRect; pWinPos.cy = pWinPos.y + nHeight;
}
else
{
pWinPos.cy = pWinPos.y + (Window->WindowRect.bottom - Window->WindowRect.top);
}
NtUserSendMessage(hWnd, WM_WINDOWPOSCHANGING, 0, (LPARAM)&pWinPos);
Window->WindowRect.top = Window->ClientRect.top = pWinPos.y;
Window->WindowRect.left = Window->ClientRect.left = pWinPos.x;
Window->WindowRect.bottom = Window->ClientRect.bottom = pWinPos.cy;
Window->WindowRect.right = Window->ClientRect.right = pWinPos.cx;
if (uStyle & WS_BORDER) if (uStyle & WS_BORDER)
{ {
@ -872,7 +906,20 @@ NtUserMoveWindow(
{ {
Window->ClientRect.top += NtUserGetSystemMetrics(SM_CYMENU); Window->ClientRect.top += NtUserGetSystemMetrics(SM_CYMENU);
} }
NtUserSendMessage(hWnd, WM_WINDOWPOSCHANGED, 0, (LPARAM)&pWinPos);
NtUserSendMessage(hWnd, WM_MOVE, 0, MAKEWORD(Window->ClientRect.left,
Window->ClientRect.top));
NtUserSendMessage(hWnd, WM_SIZE, 0, MAKEWORD(Window->ClientRect.right -
Window->ClientRect.left,
Window->ClientRect.bottom -
Window->ClientRect.top));
/* FIXME: Send WM_NCCALCSIZE */
W32kReleaseWindowObject(Window); W32kReleaseWindowObject(Window);
if (bRepaint) NtUserSendMessage(hWnd, WM_PAINT, 0, 0);
return TRUE; return TRUE;
} }