Changeset 1971 for trunk/src/user32/pmframe.cpp

Timestamp:

Dec 5, 1999, 1:31:50 AM (26 years ago)

Author:

sandervl

Message:

Rewrote some message apis + WM_WINDOWPOSCHANGED fix

File:

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

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.25 1999-12-01 18:23:28 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.26 1999-12-05 00:31:47 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -321 +321 @@
       LONG      yDelta = pswp->cy - swpOld.cy;
       LONG      xDelta = pswp->cx - swpOld.cx;
+      LONG      clientHeight;
 
         dprintf(("PMFRAME: WM_WINDOWPOSCHANGED (%x) %x %x (%d,%d) (%d,%d)", mp2, win32wnd->getWindowHandle(), pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+
+        //Save height so WM_WINDOWPOSCHANGED handler in pmwindow.cpp 
+        //(for client) doesn't overwrite the client rectangle (breaks ydelta calculation)
+        clientHeight = win32wnd->getWindowHeight();
 
         RestoreOS2TIB();
@@ -329 +334 @@
 
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
-            goto PosChangedEnd;
-
-        if(!win32wnd->CanReceiveSizeMsgs())
             goto PosChangedEnd;
 
@@ -345 +347 @@
 
         //delta is difference between old and new client height
-        yDelta = swpOld.cy - win32wnd->getWindowHeight();
+        yDelta = swpOld.cy - clientHeight;
 
         win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
         win32wnd->setClientRect(swpOld.x, swpOld.y, swpOld.x + swpOld.cx, swpOld.y + swpOld.cy);
+
+        if(!win32wnd->CanReceiveSizeMsgs())
+            goto PosChangedEnd;
 
         wp.hwnd = win32wnd->getWindowHandle();
@@ -385 +390 @@
                     swp[i].fl &= ~(SWP_NOREDRAW);
                 }
-                //else child window with the same start coorindates as the client area
+                //else child window with the same start coordinates as the client area
                 //The app should resize it.