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

Timestamp:

Feb 20, 2001, 4:40:23 PM (25 years ago)

Author:

sandervl

Message:

ScrollWindow, maximized window + system menu fixes

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.90 2001-02-19 13:13:00 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.91 2001-02-20 15:40:22 sandervl Exp $ */
 
 /*
@@ -231 +231 @@
 
 //testestest
-   if(wnd && wnd->getWindowWidth() && wnd->getWindowHeight()) {
-       RECTL recttmp, rectviewold;
-
-       rc = GpiQueryPageViewport(pHps->hps, &rectviewold);
-       if(rc == 0) {
-           dprintf(("WARNING: GpiQueryPageViewport returned FALSE!!"));
-       }
-       recttmp.xLeft   = 0;
-//       recttmp.xRight  = ((double)wnd->getWindowWidth() / xScale);
-       recttmp.xRight  = ((double)GetScreenWidth() / xScale);
-       recttmp.yBottom = 0;
-//       recttmp.yTop    = ((double)wnd->getWindowHeight() / yScale);
-       recttmp.yTop    = ((double)GetScreenHeight() / yScale);
-
-       if(recttmp.yTop != rectviewold.yTop || 
-          recttmp.xRight != rectviewold.xRight)
-       {
-           dprintf(("GpiSetPageViewport %x (%d,%d) %f %f", pHps->hps, recttmp.xRight, recttmp.yTop, xScale, yScale));
-           rc = GpiSetPageViewport(pHps->hps, &recttmp);
-           if(rc == 0) {
-              dprintf(("WARNING: GpiSetPageViewport returned FALSE!!"));
-           }
-       }
+   if(wnd && wnd->getWindowWidth() && wnd->getWindowHeight())
+   {
+        RECTL recttmp, rectviewold;
+
+        rc = GpiQueryPageViewport(pHps->hps, &rectviewold);
+        if(rc == 0) {
+            dprintf(("WARNING: GpiQueryPageViewport returned FALSE!!"));
+        }
+        recttmp.xLeft   = 0;
+        recttmp.xRight  = ((double)GetScreenWidth() / xScale);
+        recttmp.yBottom = 0;
+        recttmp.yTop    = ((double)GetScreenHeight() / yScale);
+
+        if(recttmp.yTop != rectviewold.yTop ||
+           recttmp.xRight != rectviewold.xRight)
+        {
+            if(pHps->viewportYExt > pHps->windowExt.cy) {//scaling up means we have to invert the y values
+                recttmp.yBottom = GetScreenHeight() - recttmp.yTop;
+                recttmp.yTop    = GetScreenHeight();
+            }
+            dprintf(("GpiSetPageViewport %x (%d,%d)(%d,%d) %f %f", pHps->hps, recttmp.xLeft, recttmp.yBottom, recttmp.xRight, recttmp.yTop, xScale, yScale));
+            rc = GpiSetPageViewport(pHps->hps, &recttmp);
+            if(rc == 0) {
+                dprintf(("WARNING: GpiSetPageViewport returned FALSE!!"));
+            }
+        }
    }
 //testestest
@@ -1698 +1701 @@
 }
 //******************************************************************************
+//SvL: Using WinScrollWindow to scroll child windows is better (smoother).
 //******************************************************************************
 INT WIN32API ScrollWindowEx(HWND hwnd, int dx, int dy, const RECT *pScroll, const RECT *pClip,
@@ -1724 +1728 @@
 
     if (scrollFlag & SW_INVALIDATE_W)      scrollFlagsOS2 |= SW_INVALIDATERGN;
+    if (scrollFlag & SW_SCROLLCHILDREN_W)  scrollFlagsOS2 |= SW_SCROLLCHILDREN;
 
     mapWin32ToOS2Rect(window->getWindowHeight(), window->getClientRectPtr(), (PRECTLOS2)&clientRect);
@@ -1758 +1763 @@
       //CB: todo, scroll in several steps
       //    is time in ms? time <-> iteration count?
-    }
-
-    // Scroll children first
-    if (scrollFlag & SW_SCROLLCHILDREN_W)
-    {
-        HWND hwndChild;
-        RECT rectChild, rc;
-
-            dprintf(("ScrollWindowEx: Scroll child windows"));
-            GetClientRect(hwnd, &rc);
-            if (pScroll) IntersectRect(&rc, &rc, pScroll);
-
-            hwndChild = GetWindow(hwnd, GW_CHILD_W);
-
-            while(hwndChild)
-            {
-                Win32BaseWindow *child;
-
-                child = Win32BaseWindow::GetWindowFromHandle(hwndChild);
-                if(!child) {
-                    dprintf(("ScrollWindowEx, child %x not found", hwnd));
-                    return 0;
-                }
-                rectChild = *child->getWindowRect();
-                if(!pRectUpdate || IntersectRect(&rectChild, &rectChild, &rc))
-                {
-                     dprintf(("ScrollWindowEx: Scroll child window %x", hwndChild));
-                     SetWindowPos(hwndChild, 0, rectChild.left + dx,
-                                  rectChild.top + orgdy, 0, 0, SWP_NOZORDER_W |
-                                  SWP_NOSIZE_W | SWP_NOACTIVATE_W | SWP_NOREDRAW);
-                }
-                hwndChild = GetWindow(hwndChild, GW_HWNDNEXT_W);
-            }
-            dprintf(("***ScrollWindowEx: Scroll child windows DONE"));
     }
 
@@ -1801 +1772 @@
     {
         return ERROR_W;
+    }
+
+    //Notify children that they have moved (according to the SDK docs,
+    //they only receive a WM_MOVE message)
+    //(PM only does this for windows with CS_MOVENOTIFY class)
+    //TODO: Verify this (no WM_WINDOWPOSCHANGING/ED?)
+    if (scrollFlag & SW_SCROLLCHILDREN_W)
+    {
+        HWND hwndChild;
+        RECT rectChild, rc;
+
+            dprintf(("ScrollWindowEx: Scroll child windows"));
+            GetClientRect(hwnd, &rc);
+            if (pScroll) IntersectRect(&rc, &rc, pScroll);
+
+            hwndChild = GetWindow(hwnd, GW_CHILD_W);
+
+            while(hwndChild)
+            {
+                Win32BaseWindow *child;
+
+                child = Win32BaseWindow::GetWindowFromHandle(hwndChild);
+                if(!child) {
+                    dprintf(("ERROR: ScrollWindowEx, child %x not found", hwnd));
+                    return 0;
+                }
+                rectChild = *child->getWindowRect();
+                if(!pRectUpdate || IntersectRect(&rectChild, &rectChild, &rc))
+                {
+                     dprintf(("ScrollWindowEx: Scroll child window %x", hwndChild));
+                     child->ScrollWindow(dx, orgdy);
+                }
+                hwndChild = GetWindow(hwndChild, GW_HWNDNEXT_W);
+            }
+            dprintf(("***ScrollWindowEx: Scroll child windows DONE"));
     }