ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: SetWindowPos should erase the parent also for child moves.

Browse Source
This commit is contained in:
Alexandre Julliard 2007-08-27 15:13:51 +02:00
parent effdfa7da4
commit a887a64c17
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/user32/tests/msg.c
View File

@ -941,6 +941,7 @@ static const struct message WmDragThickBordersBarSeq[] = { /* FIXME: add */
static const struct message WmResizingChildWithMoveWindowSeq[] = { static const struct message WmResizingChildWithMoveWindowSeq[] = {
{ WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_NOACTIVATE },
{ WM_NCCALCSIZE, sent|wparam, 1 }, { WM_NCCALCSIZE, sent|wparam, 1 },
{ WM_ERASEBKGND, sent|parent|optional },
{ WM_ERASEBKGND, sent|optional }, { WM_ERASEBKGND, sent|optional },
{ WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE }, { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOACTIVATE },
{ WM_MOVE, sent|defwinproc }, { WM_MOVE, sent|defwinproc },
@ -4020,8 +4021,10 @@ static void test_messages(void)
/* test WM_SETREDRAW on a visible child window */ /* test WM_SETREDRAW on a visible child window */
test_WM_SETREDRAW(hchild); test_WM_SETREDRAW(hchild);
log_all_parent_messages++;
MoveWindow(hchild, 10, 10, 20, 20, TRUE); MoveWindow(hchild, 10, 10, 20, 20, TRUE);
ok_sequence(WmResizingChildWithMoveWindowSeq, "MoveWindow:child", FALSE); ok_sequence(WmResizingChildWithMoveWindowSeq, "MoveWindow:child", FALSE);
log_all_parent_messages--;
ShowWindow(hchild, SW_HIDE); ShowWindow(hchild, SW_HIDE);
flush_sequence(); flush_sequence();

20
dlls/user32/winpos.c
View File

@ -1604,19 +1604,15 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos )
&newWindowRect, &newClientRect, orig_flags, valid_rects )) &newWindowRect, &newClientRect, orig_flags, valid_rects ))
return FALSE; return FALSE;
/* erase parent if hiding child */ /* erase parent when hiding or resizing child */
if (!(orig_flags & SWP_DEFERERASE)) if (!(orig_flags & SWP_DEFERERASE) &&
((orig_flags & SWP_HIDEWINDOW) ||
(!(orig_flags & SWP_SHOWWINDOW) &&
(winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE)))
{ {
if (orig_flags & SWP_HIDEWINDOW) HWND parent = GetAncestor( winpos->hwnd, GA_PARENT );
{ if (!parent || parent == GetDesktopWindow()) parent = winpos->hwnd;
HWND parent = GetAncestor( winpos->hwnd, GA_PARENT ); erase_now( parent, 0 );
erase_now( parent, RDW_NOCHILDREN );
}
else if (!(orig_flags & SWP_SHOWWINDOW) &&
(winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE)
{
erase_now( winpos->hwnd, 0 );
}
} }
if( winpos->flags & SWP_HIDEWINDOW ) if( winpos->flags & SWP_HIDEWINDOW )