Changeset 5171 for trunk/src/user32/dc.cpp

Timestamp:

Feb 18, 2001, 6:03:47 PM (25 years ago)

Author:

sandervl

Message:

ScrollWindowEx fix

File:

• trunk/src/user32/dc.cpp (modified) (8 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.86 2001-02-18 14:18:38 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.87 2001-02-18 17:03:47 sandervl Exp $ */
 
 /*
@@ -376 +376 @@
    PRECT pClient = window->getClientRectPtr();
    PRECT pWindow = window->getWindowRect();
+   RECT  rectWindow;
+   RECTL rectWindowOS2;
 
    if(pClient->left == 0 && pClient->top == 0 &&
@@ -397 +399 @@
         //TODO: counter
         dprintf2(("WARNING: selectClientArea %x; already selected! origin (%d,%d) original origin (%d,%d)", window->getWindowHandle(), rcltemp.xLeft, rcltemp.yBottom, pHps->ptlOrigin.x, pHps->ptlOrigin.y));
-        RECT rectWindow;
-        RECTL rectWindowOS2;
         GetWindowRect(window->getWindowHandle(), &rectWindow);
         mapWin32ToOS2Rect(OSLibGetScreenHeight(), &rectWindow, (PRECTLOS2)&rectWindowOS2);
@@ -421 +421 @@
         pHps->ptlOrigin.y = rcltemp.yBottom;
    }
-
    dprintf2(("selectClientArea %x: (%d,%d) -> (%d,%d)", window->getWindowHandle(), rcltemp.xLeft, rcltemp.yBottom, rcl.xLeft, rcl.yBottom));
 
@@ -428 +427 @@
 
    hrgnRect = GreCreateRectRegion(pHps->hps, &rcl, 1);
+#if 0
+   if(window->getParent()) 
+   {
+     HRGN hrgnParentClip;
+
+        pClient = window->getParent()->getClientRectPtr();
+        GetWindowRect(window->getParent()->getWindowHandle(), &rectWindow);
+        rectWindow.right   = rectWindow.left + pClient->right;
+        rectWindow.left   += pClient->left;
+        rectWindow.bottom  = rectWindow.top + pClient->bottom;
+        rectWindow.top    += pClient->top;
+        mapWin32ToOS2Rect(OSLibGetScreenHeight(), &rectWindow, (PRECTLOS2)&rectWindowOS2);
+
+        hrgnParentClip = GreCreateRectRegion(pHps->hps, &rectWindowOS2, 1);
+        GreCombineRegion(pHps->hps, hrgnRect, hrgnParentClip, hrgnRect, CRGN_AND);
+        GreDestroyRegion(pHps->hps, hrgnParentClip);
+   }
+#endif
 
    // Query the visible region
@@ -451 +468 @@
    // Destroy the region now we have finished with it.
    GreDestroyRegion(pHps->hps, hrgnRect);
+
+//testestest
+   GpiQueryViewingLimits(pHps->hps, &rectWindowOS2);
+   dprintf(("view limits (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
+   GpiQueryDefViewingLimits(pHps->hps, &rectWindowOS2);
+   dprintf(("def view limits (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
+   GpiQueryPageViewport(pHps->hps, &rectWindowOS2);
+   dprintf(("page viewport (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
+
+   GpiQueryGraphicsField(pHps->hps, &rectWindowOS2);
+   dprintf(("graphics field (%d,%d)(%d,%d)", rectWindowOS2.xLeft, rectWindowOS2.yBottom, rectWindowOS2.xRight, rectWindowOS2.yTop));
+
+   SIZEL size;
+   GpiQueryPickApertureSize(pHps->hps, &size);
+   dprintf(("page viewport (%d,%d)", size.cx, size.cy));
+//testestest
+
 }
 //******************************************************************************
@@ -1703 +1737 @@
                 }
                 rectChild = *child->getWindowRect();
-                if(pRectUpdate || IntersectRect(&rectChild, &rectChild, &rc))
+                if(!pRectUpdate || IntersectRect(&rectChild, &rectChild, &rc))
                 {
                      dprintf(("ScrollWindowEx: Scroll child window %x", hwndChild));
@@ -1740 +1774 @@
         ((lComplexity == RGN_RECT) || (lComplexity == RGN_COMPLEX)))
     {
-       rc = InvalidateRect (hwnd, &winRectUpdate, (scrollFlag & SW_ERASE_W) ? 1 : 0);
+       rc = RedrawWindow (hwnd, &winRectUpdate, NULLHANDLE,
+                          RDW_ALLCHILDREN_W | RDW_INVALIDATE_W |
+                          ((scrollFlag & SW_ERASE_W) ? RDW_ERASE_W : 0) |
+                          RDW_UPDATENOW_W);
+
+//       rc = InvalidateRect (hwnd, &winRectUpdate, (scrollFlag & SW_ERASE_W) ? 1 : 0);
        if (rc == FALSE)
        {