Changeset 9418 for trunk/src/user32/win32wbase.cpp

Timestamp:

Nov 20, 2002, 1:59:06 PM (23 years ago)

Author:

sandervl

Message:

Ignore size changes when a window is minimized; save them for restore

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.342 2002-10-15 09:18:10 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.343 2002-11-20 12:59:06 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2344 +2344 @@
 
     if (!(getStyle() & WS_MINIMIZE)) {
-         SetWindowPos(HWND_TOP, newPos.left, newPos.top, newPos.right, newPos.bottom, LOWORD(swp));
+         SetWindowPos(HWND_TOP, newPos.left, newPos.top, newPos.right, newPos.bottom, LOWORD(swp), TRUE);
     }
     else OSLibWinMinimizeWindow(getOS2FrameWindowHandle());
@@ -2379 +2379 @@
     }
 //testestest
+
 END:
     fMinMaxChange = FALSE;
@@ -2385 +2386 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32BaseWindow::SetWindowPos(HWND hwndInsertAfter, int x, int y, int cx, int cy, UINT fuFlags)
+BOOL Win32BaseWindow::SetWindowPos(HWND hwndInsertAfter, int x, int y, int cx, 
+                                   int cy, UINT fuFlags, BOOL fShowWindow)
 {
    BOOL rc = FALSE;
@@ -2493 +2495 @@
         OSLibWinQueryWindowPos(OS2HwndFrame, &swpOld);
     }
+    if((dwOldStyle & WS_MINIMIZE) && (getStyle() & WS_MINIMIZE)) 
+    {//don't allow size changes if the window is minimized
+     //we will update the restore position at the end of this method
+        if(!(wpos.flags & SWP_NOSIZE)) {
+            wpos.flags |= SWP_NOSIZE;
+            rectWindow.right  = rectWindow.left + wpos.cx;
+            rectWindow.bottom = rectWindow.top + wpos.cy;
+        }
+    }
 
     if(getParent()) {
@@ -2505 +2516 @@
         {
             NotifyFrameChanged(&wpos, &oldClientRect);
+        }
+        if(!fShowWindow)
+        {
+            //Restore position always changes when the window position is changed
+            dprintf(("Save new restore position (%d,%d)(%d,%d)", rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
+            windowpos.rcNormalPosition = rectWindow;
         }
         return TRUE;
@@ -2540 +2557 @@
     }
     dprintf (("WinSetWindowPos %x %x (%d,%d)(%d,%d) %x", swp.hwnd, swp.hwndInsertBehind, swp.x, swp.y, swp.cx, swp.cy, swp.fl));
+
     rc = OSLibWinSetMultWindowPos(&swp, 1);
-
     if(rc == FALSE)
     {
@@ -2552 +2569 @@
         NotifyFrameChanged(&wpos, &oldClientRect);
     }
-    if(!(getStyle() & (WS_MAXIMIZE|WS_MINIMIZE))) {
+    if(!fShowWindow)
+    {
         //Restore position always changes when the window position is changed
         dprintf(("Save new restore position (%d,%d)(%d,%d)", rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));