system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 12:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

We should pass the callers client-area rect and clip rect to x11drv

Browse source 
otherwise we'll fail to scroll all children.
This commit is contained in:
Ulrich Czekalla 2003-05-11 03:01:42 +00:00 committed by Alexandre Julliard
parent 1bb3645443
commit 4d837749d8
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dlls/x11drv/scroll.c
View file

@ -124,15 +124,19 @@ INT X11DRV_ScrollWindowEx( HWND hwnd, INT dx, INT dy,
INT retVal;
BOOL bOwnRgn = TRUE;
BOOL bUpdate = (rcUpdate || hrgnUpdate || flags & (SW_INVALIDATE | SW_ERASE));
HRGN hrgnClip = CreateRectRgnIndirect(clipRect);
HRGN hrgnTemp;
HDC hDC;
RECT rc, cliprc;
TRACE( "%p, %d,%d hrgnUpdate=%p rcUpdate = %p rect=(%ld,%ld-%ld,%ld) %04x\n",
hwnd, dx, dy, hrgnUpdate, rcUpdate,
rect->left, rect->top, rect->right, rect->bottom, flags );
TRACE( "clipRect = (%ld,%ld,%ld,%ld)\n",
clipRect->left, clipRect->top, clipRect->right, clipRect->bottom );
TRACE( "%p, %d,%d hrgnUpdate=%p rcUpdate = %p %s %04x\n",
hwnd, dx, dy, hrgnUpdate, rcUpdate, wine_dbgstr_rect(rect), flags );
TRACE( "clipRect = %s\n", wine_dbgstr_rect(clipRect));
GetClientRect(hwnd, &rc);
if (rect) IntersectRect(&rc, &rc, rect);
if (clipRect) IntersectRect(&cliprc,&rc,clipRect);
else cliprc = rc;
if( hrgnUpdate ) bOwnRgn = FALSE;
else if( bUpdate ) hrgnUpdate = CreateRectRgn( 0, 0, 0, 0 );
@ -142,7 +146,7 @@ INT X11DRV_ScrollWindowEx( HWND hwnd, INT dx, INT dy,
{
HRGN hrgn = CreateRectRgn( 0, 0, 0, 0 );
X11DRV_StartGraphicsExposures( hDC );
X11DRV_ScrollDC( hDC, dx, dy, rect, clipRect, hrgnUpdate, rcUpdate );
X11DRV_ScrollDC( hDC, dx, dy, &rc, &cliprc, hrgnUpdate, rcUpdate );
X11DRV_EndGraphicsExposures( hDC, hrgn );
ReleaseDC( hwnd, hDC );
if (bUpdate) CombineRgn( hrgnUpdate, hrgnUpdate, hrgn, RGN_OR );
@ -155,9 +159,11 @@ INT X11DRV_ScrollWindowEx( HWND hwnd, INT dx, INT dy,
retVal = GetUpdateRgn( hwnd, hrgnTemp, FALSE );
if (retVal != NULLREGION)
{
HRGN hrgnClip = CreateRectRgnIndirect(&cliprc);
OffsetRgn( hrgnTemp, dx, dy );
CombineRgn( hrgnTemp, hrgnTemp, hrgnClip, RGN_AND );
RedrawWindow( hwnd, NULL, hrgnTemp, RDW_INVALIDATE | RDW_ERASE );
DeleteObject( hrgnClip );
}
DeleteObject( hrgnTemp );
@ -172,7 +178,7 @@ INT X11DRV_ScrollWindowEx( HWND hwnd, INT dx, INT dy,
{
GetWindowRect( list[i], &r );
MapWindowPoints( 0, hwnd, (POINT *)&r, 2 );
if (!rect || IntersectRect(&dummy, &r, rect))
if (!rect || IntersectRect(&dummy, &r, &rc))
SetWindowPos( list[i], 0, r.left + dx, r.top + dy, 0, 0,
SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE |
SWP_NOREDRAW | SWP_DEFERERASE );
@ -187,7 +193,6 @@ INT X11DRV_ScrollWindowEx( HWND hwnd, INT dx, INT dy,
((flags & SW_SCROLLCHILDREN) ? RDW_ALLCHILDREN : 0 ) );
if( bOwnRgn && hrgnUpdate ) DeleteObject( hrgnUpdate );
DeleteObject( hrgnClip );
return retVal;
}

2
windows/scroll.c
View file

@ -117,7 +117,7 @@ INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy,
HWND hwndCaret = fix_caret(hwnd, &caretrc, flags);
if (USER_Driver.pScrollWindowEx)
result = USER_Driver.pScrollWindowEx( hwnd, dx, dy, &rc, &cliprc,
result = USER_Driver.pScrollWindowEx( hwnd, dx, dy, rect, clipRect,
hrgnUpdate, rcUpdate, flags );
else
result = ERROR; /* FIXME: we should have a fallback implementation */