Changeset 2521 for trunk/src/user32/pmframe.cpp

Timestamp:

Jan 26, 2000, 7:02:38 PM (26 years ago)

Author:

cbratschi

Message:

refixed WM_WINDOWPOS*

File:

• trunk/src/user32/pmframe.cpp (modified) (4 diffs)

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.38 2000-01-20 16:48:55 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.39 2000-01-26 18:02:35 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -141 +141 @@
     case WM_QUERYTRACKINFO:
     {
-      //CB: todo: use minmaxinfo
-      goto RunDefFrameProc;
+      PTRACKINFO trackInfo = (PTRACKINFO)mp2;
+
+      RestoreOS2TIB();
+      OldFrameProc(hwnd,msg,mp1,mp2);
+      SetWin32TIB();
+      trackInfo->cxBorder = 0;
+      trackInfo->cyBorder = 0;
+      win32wnd->AdjustTrackInfo((PPOINT)&trackInfo->ptlMinTrackSize,(PPOINT)&trackInfo->ptlMaxTrackSize);
+      RestoreOS2TIB();
+      return (MRESULT)TRUE;
     }
 
@@ -212 +220 @@
       PSWP     pswp = (PSWP)mp1;
       SWP      swpOld;
-      WINDOWPOS wp;
+      WINDOWPOS wp,wpOld;
       HWND      hParent = NULLHANDLE, hwndAfter;
 
@@ -254 +262 @@
         }
 
-        //CB: problems with profmine titlebar tracking
-        if(win32wnd->MsgPosChanging((LPARAM)&wp) == 0)
-        {//app or default window handler changed wp
-            dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS, app changed windowpos struct"));
-            dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
-
-            OSLibMapWINDOWPOStoSWPFrame(&wp, pswp, &swpOld, hParent, hwnd);
-            dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
-            pswp->fl |= SWP_NOADJUST;
-            pswp->hwndInsertBehind = hwndAfter;
-            pswp->hwnd = hwnd;
-
-            RestoreOS2TIB();
-            return (MRESULT)0xf;
+        wpOld = wp;
+        win32wnd->MsgPosChanging((LPARAM)&wp);
+
+        if ((wp.hwndInsertAfter != wpOld.hwndInsertAfter) ||
+            (wp.x != wpOld.x) || (wp.y != wpOld.y) || (wp.cx != wpOld.cx) || (wp.cy != wpOld.cy) || (wp.flags != wpOld.flags))
+        {
+          dprintf(("PMFRAME: WM_ADJUSTWINDOWPOS, app changed windowpos struct"));
+          dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+
+          OSLibMapWINDOWPOStoSWPFrame(&wp, pswp, &swpOld, hParent, hwnd);
+          dprintf(("%x (%d,%d), (%d,%d)", pswp->fl, pswp->x, pswp->y, pswp->cx, pswp->cy));
+          pswp->fl |= SWP_NOADJUST;
+          pswp->hwndInsertBehind = hwndAfter;
+          pswp->hwnd = hwnd;
+
+          RestoreOS2TIB();
+          return (MRESULT)0xf;
         }
         goto RunDefFrameProc;