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

Timestamp:

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

Author:

sandervl

Message:

FrameTrackFrame & nccalcsize bugfixes

File:

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

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);
             }
         }