Changeset 2435 for trunk/src/user32/new/win32wbasepos.cpp

Timestamp:

Jan 14, 2000, 2:16:59 PM (26 years ago)

Author:

sandervl

Message:

Several window position bugfixes

File:

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

trunk/src/user32/new/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.6 2000-01-13 20:11:39 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.7 2000-01-14 13:16:59 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -134 +134 @@
         winposCopy = *winpos;
         params.rgrc[1] = *oldWindowRect;
-#if 0
         if(getParent()) {//in parent coordinates
             MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), (POINT *)oldClientRect, 2);
@@ -141 +140 @@
             OffsetRect(oldClientRect, rectWindow.left, rectWindow.top);
         }
-#endif
         params.rgrc[2] = *oldClientRect;
         params.lppos = &winposCopy;
    }
    result = SendInternalMessageA(WM_NCCALCSIZE, calcValidRect, (LPARAM)&params );
-   if (calcValidRect)
+
+   /* 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)
    {
-      /* If the application send back garbage, ignore it */
-      if (params.rgrc[2].left <= params.rgrc[2].right && params.rgrc[2].top <= params.rgrc[2].bottom)
-      {
-        *newClientRect = params.rgrc[2];
-#if 0
-        if(getParent()) {//in parent coordinates
-            MapWindowPoints(getParent()->getWindowHandle(), getWindowHandle(), (POINT *)newClientRect, 2);
-        }
-        else {//in screen coordinates (just add window rectangle origin (already in screen coordinates))
-            OffsetRect(newClientRect, -rectWindow.left, -rectWindow.top);
-        }
-#endif
-      }
-      else
-        SetRectEmpty(newClientRect);
+        *newClientRect = params.rgrc[0];
+        //client rectangle now in screen coordinates; convert to 'frame' coordinates
+        OffsetRect(newClientRect, -rectWindow.left, -rectWindow.top);
    }