user32: Also change rcUpdate when scrolling by more than the window size.
Signed-off-by: Vincent Povirk <vincent@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
b72c2e85b4
commit
1383012395
|
@ -1501,6 +1501,13 @@ static INT scroll_window( HWND hwnd, INT dx, INT dy, const RECT *rect, const REC
|
||||||
CombineRgn( hrgnTemp, hrgnTemp, hrgnClip, RGN_AND );
|
CombineRgn( hrgnTemp, hrgnTemp, hrgnClip, RGN_AND );
|
||||||
CombineRgn( hrgnUpdate, hrgnUpdate, hrgnTemp, RGN_OR );
|
CombineRgn( hrgnUpdate, hrgnUpdate, hrgnTemp, RGN_OR );
|
||||||
|
|
||||||
|
if (rcUpdate)
|
||||||
|
{
|
||||||
|
RECT rcTemp;
|
||||||
|
GetRgnBox( hrgnTemp, &rcTemp );
|
||||||
|
UnionRect( rcUpdate, rcUpdate, &rcTemp );
|
||||||
|
}
|
||||||
|
|
||||||
if( !bOwnRgn)
|
if( !bOwnRgn)
|
||||||
CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR );
|
CombineRgn( hrgnWinupd, hrgnWinupd, hrgnTemp, RGN_OR );
|
||||||
}
|
}
|
||||||
|
|
|
@ -4841,11 +4841,25 @@ static void test_scrollvalidate( HWND parent)
|
||||||
rcu.left,rcu.top,rcu.right,rcu.bottom);
|
rcu.left,rcu.top,rcu.right,rcu.bottom);
|
||||||
ReleaseDC( hwnd1, hdc);
|
ReleaseDC( hwnd1, hdc);
|
||||||
|
|
||||||
/* test scrolling a window with an update region */
|
/* test scrolling a rect by more than its size */
|
||||||
DestroyWindow( hwnd2);
|
DestroyWindow( hwnd2);
|
||||||
ValidateRect( hwnd1, NULL);
|
ValidateRect( hwnd1, NULL);
|
||||||
SetRect( &rc, 40,40, 50,50);
|
SetRect( &rc, 40,40, 50,50);
|
||||||
InvalidateRect( hwnd1, &rc, 1);
|
InvalidateRect( hwnd1, &rc, 1);
|
||||||
|
ScrollWindowEx( hwnd1, -20, 0, &rc, NULL, hrgn, &rcu,
|
||||||
|
SW_SCROLLCHILDREN | SW_INVALIDATE);
|
||||||
|
if (winetest_debug > 0) dump_region(hrgn);
|
||||||
|
SetRectRgn( exprgn, 20, 40, 30, 50);
|
||||||
|
SetRectRgn( tmprgn, 40, 40, 50, 50);
|
||||||
|
CombineRgn( exprgn, exprgn, tmprgn, RGN_OR);
|
||||||
|
ok( EqualRgn( exprgn, hrgn), "wrong update region\n");
|
||||||
|
ok( rcu.left == 20 && rcu.top == 40 && rcu.right == 50 && rcu.bottom == 50,
|
||||||
|
"unexpected update rect: %d,%d - %d,%d\n", rcu.left,rcu.top,rcu.right,rcu.bottom);
|
||||||
|
|
||||||
|
/* test scrolling a window with an update region */
|
||||||
|
ValidateRect( hwnd1, NULL);
|
||||||
|
SetRect( &rc, 40,40, 50,50);
|
||||||
|
InvalidateRect( hwnd1, &rc, 1);
|
||||||
GetClientRect( hwnd1, &rc);
|
GetClientRect( hwnd1, &rc);
|
||||||
cliprc=rc;
|
cliprc=rc;
|
||||||
ScrollWindowEx( hwnd1, -10, 0, &rc, &cliprc, hrgn, &rcu,
|
ScrollWindowEx( hwnd1, -10, 0, &rc, &cliprc, hrgn, &rcu,
|
||||||
|
|
Loading…
Reference in New Issue