Changeset 715 for trunk/src/user32/new/pmwindow.cpp

Timestamp:

Aug 27, 1999, 7:50:57 PM (26 years ago)

Author:

dengert

Message:

window creation, positioning, sizing

File:

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

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.21 1999-08-25 15:08:50 dengert Exp $ */
+/* $Id: pmwindow.cpp,v 1.22 1999-08-27 17:50:56 dengert Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -179 +179 @@
       WINDOWPOS wp;
       ULONG    parentHeight = 0;
+      HWND      hParent = NULLHANDLE, hFrame = NULLHANDLE;
 
         dprintf(("OS2: WM_ADJUSTWINDOWPOS %x %x (%d,%d) (%d,%d)", hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
 
+        if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) break;
+
         WinQueryWindowPos(hwnd, &swpOld);
 
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
-            parentHeight = (win32wnd->isChild()) ?
-                OSLibGetWindowHeight(win32wnd->getParent()->getOS2WindowHandle())
-              : OSLibQueryScreenHeight();
-        }
-        OSLibMapSWPtoWINDOWPOS(pswp, &wp, &swpOld, parentHeight);
+            if (win32wnd->isChild())
+                hParent = win32wnd->getParent()->getOS2WindowHandle();
+            else
+                hFrame = win32wnd->getOS2FrameWindowHandle();
+        }
+        OSLibMapSWPtoWINDOWPOS(pswp, &wp, &swpOld, hParent, hFrame);
+
         wp.hwnd = win32wnd->getWindowHandle();
         if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))
@@ -202 +207 @@
     case WM_WINDOWPOSCHANGED:
     {
-      PSWP      pswp = (PSWP)mp1;
+      PSWP      pswp  = (PSWP)mp1;
+      PSWP      pswpo = pswp + 1;
       WINDOWPOS wp;
       ULONG     parentHeight = 0;
+      HWND      hParent = NULLHANDLE, hFrame = NULLHANDLE;
 
         dprintf(("OS2: WM_WINDOWPOSCHANGED %x %x (%d,%d) (%d,%d)", hwnd, pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+
+        if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0) break;
+
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
-            parentHeight = (win32wnd->isChild()) ?
-                OSLibGetWindowHeight(win32wnd->getParent()->getOS2WindowHandle())
-              : OSLibQueryScreenHeight();
-        }
-        OSLibMapSWPtoWINDOWPOS(pswp, &wp, pswp+1, parentHeight);
+            if (win32wnd->isChild())
+                hParent = win32wnd->getParent()->getOS2WindowHandle();
+            else
+                hFrame = win32wnd->getOS2FrameWindowHandle();
+        }
+        OSLibMapSWPtoWINDOWPOS(pswp, &wp, pswpo, hParent, hFrame);
+
+        win32wnd->setWindowRect(wp.x, wp.y, wp.x + wp.cx, wp.y + wp.cy);
+        win32wnd->setClientRect(pswpo->x, pswpo->y, pswpo->x + pswpo->cx, pswpo->y + pswpo->cy);
+
         wp.hwnd = win32wnd->getWindowHandle();
         if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))