Changeset 5777 for trunk/src/user32

Timestamp:

May 22, 2001, 11:33:16 AM (24 years ago)

Author:

sandervl

Message:

minimize & restore fixes

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (2 diffs)
• win32wbasepos.cpp (modified) (4 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.94 2001-05-16 07:42:26 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.95 2001-05-22 09:33:10 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -775 +775 @@
     else dwWinStyle &= ~WS_CLIPSIBLINGS;
 
+    if(dwStyle & WS_MINIMIZE_W) {
+         dwWinStyle |= WS_MINIMIZED;
+    }
+    else dwWinStyle &= ~WS_MINIMIZED;
+
     if(dwWinStyle != dwOldWinStyle) {
       WinSetWindowULong(hwndFrame, QWL_STYLE, dwWinStyle);

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.130 2001-05-15 14:31:39 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.131 2001-05-22 09:33:12 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -773 +773 @@
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
         {
+            if(pswp->fl & SWP_RESTORE && win32wnd->getStyle() & WS_MINIMIZE_W) {
+                dprintf(("Restoring minimized window %x", win32wnd->getWindowHandle()));
+                win32wnd->ShowWindow(SW_RESTORE_W);
+            }
             if(pswp->fl & SWP_SHOW) {
                 WinShowWindow(win32wnd->getOS2WindowHandle(), 1);

trunk/src/user32/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.24 2001-05-11 08:39:45 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.25 2001-05-22 09:33:16 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -308 +308 @@
             setStyle(getStyle() | WS_MINIMIZE);
 
-            iconPos.x = windowpos.ptMinPosition.x;
-            iconPos.y = windowpos.ptMinPosition.y;
-            WINPOS_FindIconPos(getWindowHandle(), iconPos);
-            SetRect(lpRect, iconPos.x, iconPos.y, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON) );
+            if(getParent() == NULL) {
+                SetRect(lpRect, -32000, -32000, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON));
+                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), getStyle(), getExStyle());
+            }
+            else {
+                iconPos.x = windowpos.ptMinPosition.x;
+                iconPos.y = windowpos.ptMinPosition.y;
+                WINPOS_FindIconPos(getWindowHandle(), iconPos);
+                SetRect(lpRect, iconPos.x, iconPos.y, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON) );
+            }
             break;
 
@@ -319 +325 @@
             if(getStyle() & WS_MINIMIZE )
             {
-                 setStyle(getStyle() & ~WS_MINIMIZE);
+                setStyle(getStyle() & ~WS_MINIMIZE);
+                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), getStyle(), getExStyle());
             }
             setStyle(getStyle() | WS_MAXIMIZE);
@@ -331 +338 @@
             {
                 setStyle(getStyle() & ~WS_MINIMIZE);
+                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), getStyle(), getExStyle());
 
                 if( getFlags() & WIN_RESTORE_MAX)