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

Timestamp:

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

Author:

sandervl

Message:

Several window position bugfixes

File:

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

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.39 2000-01-13 20:11:37 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.40 2000-01-14 13:16:58 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1082 +1082 @@
   RECT oldWindowRect = rectWindow, client = rectClient, newWindowRect;
   WINDOWPOS wndPos;
+  ULONG rc;
 
   if(lpWndPos) {
     //set new window rectangle
     setWindowRect(lpWndPos->x, lpWndPos->y, lpWndPos->x + lpWndPos->cx, lpWndPos->y + lpWndPos->cy);
-    newWindowRect = rectWindow;
+    newWindowRect= rectWindow;
   }
   else {
-    wndPos.hwnd  = Win32Hwnd;
+    wndPos.hwnd  = getWindowHandle();
     wndPos.hwndInsertAfter = 0;
     newWindowRect= rectWindow;
@@ -1098 +1099 @@
     wndPos.cy    = newWindowRect.bottom - newWindowRect.top;
     wndPos.flags = SWP_FRAMECHANGED;
-    lpWndPos = &wndPos;
-  }
-
-  return SendNCCalcSize(TRUE, &oldWindowRect, &newWindowRect, &client, &wndPos, &rectClient);
+    lpWndPos     = &wndPos;
+  }
+
+  rc = SendNCCalcSize(TRUE, &newWindowRect,  &oldWindowRect, &client, lpWndPos, &rectClient);
+
+  dprintf(("MsgFormatFrame: old client rect (%d,%d)(%d,%d), new client (%d,%d)(%d,%d)", client.left, client.top, client.right, client.bottom, rectClient.left, rectClient.top, rectClient.right, rectClient.bottom));
+  return rc;
 }
 //******************************************************************************