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

Timestamp:

Apr 24, 2003, 4:32:02 PM (22 years ago)

Author:

sandervl

Message:

PF: Fixed restore/maximize from minimized state for MDI windows

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.209 2003-04-23 18:00:59 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.210 2003-04-24 14:32:02 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1501 +1501 @@
         }
 
+        // PF: MDI window is not a common OS/2 frame window so we just skipped all
+        // PM default processing for it that basicly moved this window to 0,0 point
+        // and changed frame controls. Now do our own processing.
+
+        if ((pswp->fl & SWP_MAXIMIZE) && (win32wnd->getExStyle() & WS_EX_MDICHILD_W)) 
+        {
+         SendMessageA(win32wnd->getWindowHandle(), WM_SYSCOMMAND_W, SC_MAXIMIZE_W, 0);
+         goto PosChangedEnd;
+        }
+
         //SvL: When a window is made visible, then we don't receive a
         //     WM_VRNENABLED message (for some weird reason)
@@ -1981 +1991 @@
         if ((swp->fl & SWP_MAXIMIZE) == SWP_MAXIMIZE)
         {
+            // MDI frame windows are not common PM windows so we need to
+            // drop-out WHOLE chain of WM_X commands with SWP_MAXIMIZE flag
+            // finally last WM_WINDOWPOSCHANGED will take care of maximization
+
+            if (win32wnd->getExStyle() & WS_EX_MDICHILD_W) {
+               rc = 0;
+               break;
+            }
+
             RECT rect;
             rect.left = rect.top = rect.right = rect.bottom = 0;