Changeset 2458 for trunk/src/user32/new/pmframe.cpp

Timestamp:

Jan 16, 2000, 7:17:13 PM (26 years ago)

Author:

cbratschi

Message:

menu and frame changes

File:

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

trunk/src/user32/new/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.17 2000-01-14 13:16:57 sandervl Exp $ */
+/* $Id: pmframe.cpp,v 1.18 2000-01-16 18:17:11 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -118 +118 @@
       {
         win32wnd->setStyle((win32wnd->getStyle() & ~WS_MINIMIZE_W) | WS_MAXIMIZE_W);
+
+        RECT rect;
+
+        rect.left = rect.top = rect.right = rect.bottom = 0;
+        win32wnd->AdjustMaximizedRect(&rect);
+        swp->x += rect.left;
+        swp->cx += rect.right-rect.left;
+        swp->y -= rect.bottom;
+        swp->cy += rect.bottom-rect.top;
       }
       else if ((swp->fl & SWP_MINIMIZE) == SWP_MINIMIZE)
@@ -131 +140 @@
 
     case WM_QUERYBORDERSIZE:
-      goto RunDefFrameProc;
+    {
+      PWPOINT size = (PWPOINT)mp1;
+
+      size->x = 0;
+      size->y = 0;
+      RestoreOS2TIB();
+      return (MRESULT)TRUE;
+    }
 
     case WM_BUTTON1DOWN:
@@ -212 +228 @@
         if(!win32wnd->CanReceiveSizeMsgs())
            break;
-//CB: todo: adjust maximized window rect (how does WINE it?)
+
         WinQueryWindowPos(hwnd, &swpOld);
         if(pswp->fl & (SWP_MOVE | SWP_SIZE)) {
@@ -263 +279 @@
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
         {
-                goto RunDefFrameProc;
+                goto RunDefFrameProc;
         }
 
@@ -276 +292 @@
         OSLibMapSWPtoWINDOWPOSFrame(pswp, &wp, &swpOld, hParent, hwnd);
 
-        if(pswp->fl & SWP_ACTIVATE)
-        {
+        if(pswp->fl & SWP_ACTIVATE)
+        {
              WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
-        }
-
-        if(pswp->fl & (SWP_MOVE | SWP_SIZE))
-        {
-          //Note: Also updates the new window rectangle
+        }
+
+        if((pswp->fl & (SWP_MOVE | SWP_SIZE)) && !(win32wnd->getStyle() & WS_MINIMIZE_W))
+        {
+          //Note: Also updates the new window rectangle
           win32wnd->MsgFormatFrame(&wp);
 
@@ -325 +341 @@
             {
               WinInvalidateRect(hwnd,NULL,TRUE);
-            } 
+            }
             else
             {
@@ -360 +376 @@
             }
           }
-        } 
+        }
         else
         {
@@ -378 +394 @@
 
     case WM_ERASEBACKGROUND:
-        break;
+        break;
 
     case WM_CALCVALIDRECTS:
@@ -453 +469 @@
   SWP swpClient = {0};
 
-        rectOld = *win32wnd->getClientRectPtr();
+        rectOld = *win32wnd->getClientRectPtr();
         win32wnd->MsgFormatFrame(NULL);
         rectNew = *win32wnd->getClientRectPtr();
         if(WinEqualRect(0, (PRECTL)&rectOld, (PRECTL)&rectNew) == 1) {
-                WinInvalidateRect(win32wnd->getOS2FrameWindowHandle(), NULL, FALSE);
-                return;
-        } 
+                WinInvalidateRect(win32wnd->getOS2FrameWindowHandle(), NULL, FALSE);
+                return;
+        }
         //CB: todo: use result for WM_CALCVALIDRECTS
         mapWin32ToOS2Rect(win32wnd->getOS2FrameWindowHandle(), win32wnd->getClientRectPtr(), (PRECTLOS2)&rect);