Changeset 5258 for trunk/src/user32/pmwindow.cpp

Timestamp:

Feb 23, 2001, 3:52:42 PM (25 years ago)

Author:

sandervl

Message:

mdi, setcursor, min/max/restore, dlglist changes

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.119 2001-02-22 18:18:59 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.120 2001-02-23 14:52:41 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -472 +472 @@
                 else redrawAll = TRUE;
 
+                if(win32wnd->IsMixMaxStateChanging()) {
+                    dprintf(("WM_CALCVALIDRECT: window changed min/max/restore state, invalidate entire window"));
+                    redrawAll = TRUE;
+                }
+
                 if (redrawAll)
                 {
@@ -581 +586 @@
         SWP       swpOld;
         WINDOWPOS wp;
-        RECTL     newClientrect, oldClientRect;
+        RECTL     newClientRect, oldClientRect;
         ULONG     nccalcret;
 //        UINT      res = CVR_ALIGNLEFT | CVR_ALIGNTOP;
@@ -616 +621 @@
 
         //Get new client rectangle
-        mapWin32ToOS2Rect(pswp->cy, win32wnd->getClientRectPtr(), (PRECTLOS2)&newClientrect);
+        mapWin32ToOS2Rect(pswp->cy, win32wnd->getClientRectPtr(), (PRECTLOS2)&newClientRect);
 
         if(nccalcret == 0) {
@@ -647 +652 @@
             }
         }
-        if(res != 0) {
-
+        if(win32wnd->IsMixMaxStateChanging()) {
+            dprintf(("WM_CALCVALIDRECT: window changed min/max/restore state, invalidate entire window"));
+            res |= CVR_REDRAW;
+        }
+        if(res == (CVR_ALIGNTOP|CVR_ALIGNLEFT)) {
+            oldRect->xRight  -= oldClientRect.xLeft;
+            oldRect->yBottom += oldClientRect.yBottom;
+            newRect->xRight  -= newClientRect.xLeft;
+            newRect->yBottom += newClientRect.yBottom;
         }