Changeset 9662 for trunk/src

Timestamp:

Jan 10, 2003, 6:11:18 PM (23 years ago)

Author:

sandervl

Message:

must convert rectangle returned by GetClipBox to device coordinates

File:

• trunk/src/user32/dcscroll.cpp (modified) (5 diffs)

trunk/src/user32/dcscroll.cpp

@@ -1 @@
-/* $Id: dcscroll.cpp,v 1.2 2001-09-05 13:53:50 bird Exp $ */
+/* $Id: dcscroll.cpp,v 1.3 2003-01-10 17:11:18 sandervl Exp $ */
 /*
  * ScrollDC implementation
@@ -34 +34 @@
 
     if ( rc )
-    rect = *rc;
+        rect = *rc;
     else /* maybe we should just return FALSE? */
     {
         DebugInt3();
-    GetClipBox( hdc, &rect );
+        GetClipBox( hdc, &rect );
     }
 
@@ -47 +47 @@
         rClip = *prLClip;
         LPtoDP( hdc, (LPPOINT)&rClip, 2 );
-    IntersectRect( &rClip, &rect, &rClip );
+        IntersectRect( &rClip, &rect, &rClip );
     }
     else
@@ -54 +54 @@
     //limit scrolling to DC's clip rectangle
     GetClipBox( hdc, &rSrc );
+    LPtoDP(hdc, (LPPOINT)&rSrc, 2);
+
     IntersectRect( &rClip, &rSrc, &rClip );
     IntersectRect( &rect, &rSrc, &rect );
@@ -104 +106 @@
 
             if( rcUpdate )
-        {
-        GetRgnBox( hrgn, rcUpdate );
+            {
+                GetRgnBox( hrgn, rcUpdate );
 
-        /* Put the rcUpdate in logical coordinate */
-        DPtoLP( hdc, (LPPOINT)rcUpdate, 2 );
-        }
+                /* Put the rcUpdate in logical coordinate */
+                DPtoLP( hdc, (LPPOINT)rcUpdate, 2 );
+            }
             if (!hrgnUpdate) DeleteObject( hrgn );
             DeleteObject( hrgn2 );
 
     }
-
     return TRUE;
-
 }
 //******************************************************************************