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

Timestamp:

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

Author:

dengert

Message:

window creation, positioning, sizing

File:

• trunk/src/user32/new/oslibwin.cpp (modified) (11 diffs)

trunk/src/user32/new/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.24 1999-08-25 15:08:50 dengert Exp $ */
+/* $Id: oslibwin.cpp,v 1.25 1999-08-27 17:50:56 dengert Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -64 +64 @@
                 dwFrameStyle |= FCF_TITLEBAR;
 
-        dwFrameStyle |= FCF_TASKLIST;
+        dwFrameStyle |= FCF_TASKLIST | FCF_NOMOVEWITHOWNER | FCF_NOBYTEALIGN;
         *hwndFrame = WinCreateStdWindow(hwndParent, dwWinStyle,
                                        &dwFrameStyle, WIN32_STDCLASS,
@@ -403 +403 @@
 //******************************************************************************
 //******************************************************************************
-void OSLibMapSWPtoWINDOWPOS(PSWP pswp, PWINDOWPOS pwpos, PSWP pswpOld, ULONG parentHeight)
+void OSLibMapSWPtoWINDOWPOS(PSWP pswp, PWINDOWPOS pwpos, PSWP pswpOld, HWND hParent, HWND hFrame)
 {
    HWND hWindow            = pswp->hwnd;
@@ -412 +412 @@
    long cy                 = pswp->cy;
    UINT fuFlags            = (UINT)pswp->fl;
+   ULONG parentHeight;
 
    HWND  hWinAfter;
@@ -457 +458 @@
    if ( fuFlags & (SWP_MOVE | SWP_SIZE) )
    {
+      if (hParent == NULLHANDLE)
+      {
+        ULONG Offset;
+        POINTL pt = {0, 0};
+
+        Offset = OSLibGetWindowHeight(hFrame) - cy;
+        parentHeight = ScreenHeight;
+
+        cx += 2 * x;
+        cy += Offset;
+        WinMapWindowPoints (hFrame, HWND_DESKTOP, &pt, 1);
+        x = pt.x;
+        y = pt.y;
+
+        pswpOld->cx += 2 * pswpOld->x;
+        pswpOld->cy += Offset;
+        pswpOld->x   = pt.x;
+        pswpOld->y   = pt.y;
+      }
+      else
+      {
+        parentHeight = OSLibGetWindowHeight(hParent);
+      }
+
       if (fuFlags & SWP_SIZE)
       {
@@ -485 +510 @@
       // relative to top left of parent.
       //********************************************************
-      y = parentHeight - y - cy;
-
-      LONG oldY = parentHeight - pswpOld->y - pswpOld->cy;
+      y          = parentHeight - y - cy;
+      LONG oldY  = parentHeight - pswpOld->y - pswpOld->cy;
 
       // Set the SWP_NOMOVE_W flag if the window has not moved in windows
@@ -498 +522 @@
          flags |= SWP_NOSIZE_W;
    }
+
+   if (hParent == NULLHANDLE)
+   {
+       pswpOld->x  = x + pswp->x;
+       pswpOld->y  = y + cy - pswp->y - pswp->cy;
+   }
+   else {
+       pswpOld->x  = pswp->x;
+       pswpOld->y  = parentHeight - pswp->y - cy;
+   }
+   pswpOld->cx = pswp->cx;
+   pswpOld->cy = pswp->cy;
+
+dprintf(("window (%d,%d)(%d,%d)  client (%d,%d)(%d,%d)",
+         x,y,cx,cy, pswpOld->x,pswpOld->y,pswpOld->cx,pswpOld->cy));
 
    // Fill in the WINDOWPOS structure with the now calculated PM values.
@@ -510 +549 @@
 //******************************************************************************
 //******************************************************************************
-void OSLibMapWINDOWPOStoSWP(PWINDOWPOS pwpos, PSWP pswp, PSWP pswpOld, ULONG parentHeight)
+void OSLibMapWINDOWPOStoSWP(PWINDOWPOS pwpos, PSWP pswp, PSWP pswpOld, HWND hParent, HWND hFrame)
 {
    HWND hWnd              = pwpos->hwnd;
@@ -519 +558 @@
    long cy                = pwpos->cy;
    UINT fuFlags           = pwpos->flags;
+   ULONG parentHeight;
 
    HWND  hWinAfter;
@@ -571 +611 @@
    if ( flags & (SWP_MOVE | SWP_SIZE) )
    {
+      if (hParent == NULLHANDLE)
+        parentHeight = ScreenHeight;
+      else
+        parentHeight = OSLibGetWindowHeight(hParent);
+
       //**********************************************************
       // We'll need both a y and cy for the Y inversion code.
@@ -617 +662 @@
    }
 
-   // Fill in the WINDOWPOS structure with the now calculated PM values.
+   // Fill in the SWP structure with the now calculated PM values.
    pswp->fl               = flags;
    pswp->cy               = cy;