Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Small SetWindowPos fixes.

Browse source 
svn path=/trunk/; revision=6791
This commit is contained in:
Filip Navara 2003-11-24 21:01:20 +00:00
parent cadbbd51c9
commit c4f578c98c
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/subsys/win32k/ntuser/winpos.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: winpos.c,v 1.46 2003/11/23 11:39:48 navaraf Exp $ /* $Id: winpos.c,v 1.47 2003/11/24 21:01:20 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -757,6 +757,8 @@ WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
WinPos.y -= Window->Parent->ClientRect.top; WinPos.y -= Window->Parent->ClientRect.top;
} }
WinPosDoWinPosChanging(Window, &WinPos, &NewWindowRect, &NewClientRect);
/* Fix up the flags. */ /* Fix up the flags. */
if (!WinPosFixupFlags(&WinPos, Window)) if (!WinPosFixupFlags(&WinPos, Window))
{ {
@ -765,12 +767,10 @@ WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
return FALSE; return FALSE;
} }
WinPosDoWinPosChanging(Window, &WinPos, &NewWindowRect, &NewClientRect);
/* Does the window still exist? */ /* Does the window still exist? */
if (!IntIsWindow(WinPos.hwnd)) if (!IntIsWindow(WinPos.hwnd))
{ {
/* FIXME: SetLastWin32Error */ SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
return FALSE; return FALSE;
} }
@ -788,8 +788,7 @@ WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
(SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER)) (SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER))
{ {
VisBefore = VIS_ComputeVisibleRegion( VisBefore = VIS_ComputeVisibleRegion(
PsGetWin32Thread()->Desktop, Window, FALSE, PsGetWin32Thread()->Desktop, Window, FALSE, FALSE, TRUE);
Window->Style & WS_CLIPCHILDREN, Window->Style & WS_CLIPSIBLINGS);
if (UnsafeIntGetRgnBox(VisBefore, &TempRect) == NULLREGION) if (UnsafeIntGetRgnBox(VisBefore, &TempRect) == NULLREGION)
{ {
@ -872,8 +871,7 @@ WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
/* Determine the new visible region */ /* Determine the new visible region */
VisAfter = VIS_ComputeVisibleRegion( VisAfter = VIS_ComputeVisibleRegion(
PsGetWin32Thread()->Desktop, Window, FALSE, PsGetWin32Thread()->Desktop, Window, FALSE, FALSE, TRUE);
Window->Style & WS_CLIPCHILDREN, Window->Style & WS_CLIPSIBLINGS);
if (UnsafeIntGetRgnBox(VisAfter, &TempRect) == NULLREGION) if (UnsafeIntGetRgnBox(VisAfter, &TempRect) == NULLREGION)
{ {
@ -902,7 +900,7 @@ WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
* we don't have to crop (can't take anything away from an empty * we don't have to crop (can't take anything away from an empty
* region...) * region...)
*/ */
if (!(WinPos.flags & SWP_NOSIZE) && RgnType != ERROR && if (!(WinPos.flags & (SWP_NOSIZE | SWP_NOZORDER)) && RgnType != ERROR &&
RgnType != NULLREGION) RgnType != NULLREGION)
{ {
RECT ORect = OldClientRect; RECT ORect = OldClientRect;