Changeset 5655

Timestamp:

May 4, 2001, 7:02:52 PM (24 years ago)

Author:

sandervl

Message:

FrameTrackFrame & nccalcsize bugfixes

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (5 diffs)
• win32wbasepos.cpp (modified) (2 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.97 2001-04-27 17:36:36 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.98 2001-05-04 17:02:50 sandervl Exp $ */
 
 /*
@@ -491 +491 @@
 
         hrgnParentClip = GreCreateRectRegion(pHps->hps, &rectWindowOS2, 1);
+#ifdef DEBUG
+        dprintf(("Combining client & parent client regions"));
+        dprintfRegion1(pHps->hps, window->getWindowHandle(), hrgnParentClip);
+        dprintfRegion1(pHps->hps, window->getWindowHandle(), hrgnRect);
+#endif
+
         GreCombineRegion(pHps->hps, hrgnRect, hrgnParentClip, hrgnRect, CRGN_AND);
         GreDestroyRegion(pHps->hps, hrgnParentClip);

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.123 2001-04-27 17:36:37 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.124 2001-05-04 17:02:51 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1375 +1375 @@
   HPS       hpsTrack;
   LONG      parentHeight, parentWidth;
+  LONG      clientOrgX, clientOrgY;
 
     dprintf(("FrameTrackFrame: %x %x", win32wnd->getWindowHandle(), flags));
@@ -1390 +1391 @@
         hwndTracking = win32wnd->getParent()->getOS2WindowHandle();
         hpsTrack     = WinGetPS(hwndTracking);
+        clientOrgX   = win32wnd->getParent()->getClientRectPtr()->left;
+        clientOrgY   = win32wnd->getParent()->getClientRectPtr()->top;
     }
     else {
@@ -1396 +1399 @@
         hwndTracking = HWND_DESKTOP;
         hpsTrack     = NULL;
+        clientOrgX   = 0;
+        clientOrgY   = 0;
     }
 
     mapWin32ToOS2Rect(parentHeight, pWindowRect, (PRECTLOS2)&track.rclTrack);
+    track.rclTrack.xLeft += clientOrgX;
+    track.rclTrack.yTop  -= clientOrgY;
+    rcl = track.rclTrack;
     WinQueryWindowRect(hwndTracking, &track.rclBoundary);
 
@@ -1423 +1431 @@
             }
             else {
-              SetWindowPos(win32wnd->getWindowHandle(), 0, track.rclTrack.xLeft,
-                           parentHeight - track.rclTrack.yTop,
-                           track.rclTrack.xRight - track.rclTrack.xLeft,
-                           track.rclTrack.yTop - track.rclTrack.yBottom,
-                           SWP_NOACTIVATE_W | SWP_NOZORDER_W | SWP_NOACTIVATE_W);
-//                WinSetWindowPos(win32wnd->getOS2WindowHandle(),
-//                                0, track.rclTrack.xLeft, track.rclTrack.yBottom,
-//                               track.rclTrack.xRight - track.rclTrack.xLeft,
-//                                track.rclTrack.yTop - track.rclTrack.yBottom,
-//                                SWP_SIZE|SWP_MOVE);
+////              SetWindowPos(win32wnd->getWindowHandle(), 0, track.rclTrack.xLeft,
+////                           parentHeight - track.rclTrack.yTop,
+////                           track.rclTrack.xRight - track.rclTrack.xLeft,
+////                           track.rclTrack.yTop - track.rclTrack.yBottom,
+////                           SWP_NOACTIVATE_W | SWP_NOZORDER_W | SWP_NOACTIVATE_W);
+                WinSetWindowPos(win32wnd->getOS2WindowHandle(),
+                                0, track.rclTrack.xLeft, track.rclTrack.yBottom,
+                                track.rclTrack.xRight - track.rclTrack.xLeft,
+                                track.rclTrack.yTop - track.rclTrack.yBottom,
+                                SWP_SIZE|SWP_MOVE);
             }
         }

trunk/src/user32/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.22 2001-02-23 14:52:42 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.23 2001-05-04 17:02:52 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -153 +153 @@
 
    /* Send WM_NCCALCSIZE message to get new client area */
-   if((winpos->flags & (SWP_FRAMECHANGED | SWP_NOSIZE)) != SWP_NOSIZE )
+   params.rgrc[0] = *newWindowRect;
+   if(calcValidRect)
    {
-        params.rgrc[0] = *newWindowRect;
-        if(calcValidRect)
-        {
-            winposCopy = *winpos;
-            params.rgrc[1] = *oldWindowRect;
-            params.rgrc[2] = *oldClientRect;
-            //client rectangel must be in parent coordinates
-            OffsetRect(&params.rgrc[2], rectWindow.left, rectWindow.top);
-
-            params.lppos = &winposCopy;
-        }
-        result = SendInternalMessageA(WM_NCCALCSIZE, calcValidRect, (LPARAM)&params );
-
-        /* If the application send back garbage, ignore it */
-        if(params.rgrc[0].left <= params.rgrc[0].right && params.rgrc[0].top <= params.rgrc[0].bottom)
-        {
-            *newClientRect = params.rgrc[0];
-            //client rectangle now in parent coordinates; convert to 'frame' coordinates
-            OffsetRect(newClientRect, -rectWindow.left, -rectWindow.top);
-        }
-
-        /* FIXME: WVR_ALIGNxxx */
-        if(newClientRect->left != rectClient.left || newClientRect->top  != rectClient.top)
-           winpos->flags &= ~SWP_NOCLIENTMOVE;
-
-        if((newClientRect->right - newClientRect->left != rectClient.right - rectClient.left) ||
-           (newClientRect->bottom - newClientRect->top != rectClient.bottom - rectClient.top))
-             winpos->flags &= ~SWP_NOCLIENTSIZE;
-
+        winposCopy = *winpos;
+        params.rgrc[1] = *oldWindowRect;
+        params.rgrc[2] = *oldClientRect;
+        //client rectangel must be in parent coordinates
+        OffsetRect(&params.rgrc[2], rectWindow.left, rectWindow.top);
+
+        params.lppos = &winposCopy;
    }
-   else
-   if(!(winpos->flags & SWP_NOMOVE) &&
-       (newClientRect->left != rectClient.left || newClientRect->top != rectClient.top)) {
-            winpos->flags &= ~SWP_NOCLIENTMOVE;
+   result = SendInternalMessageA(WM_NCCALCSIZE, calcValidRect, (LPARAM)&params );
+
+   /* If the application send back garbage, ignore it */
+   if(params.rgrc[0].left <= params.rgrc[0].right && params.rgrc[0].top <= params.rgrc[0].bottom)
+   {
+        *newClientRect = params.rgrc[0];
+        //client rectangle now in parent coordinates; convert to 'frame' coordinates
+        OffsetRect(newClientRect, -rectWindow.left, -rectWindow.top);
    }
+
+   /* FIXME: WVR_ALIGNxxx */
+   if(newClientRect->left != rectClient.left || newClientRect->top  != rectClient.top)
+        winpos->flags &= ~SWP_NOCLIENTMOVE;
+
+   if((newClientRect->right - newClientRect->left != rectClient.right - rectClient.left) ||
+       (newClientRect->bottom - newClientRect->top != rectClient.bottom - rectClient.top))
+        winpos->flags &= ~SWP_NOCLIENTSIZE;
+
    return result;
 }