Changeset 9871

Timestamp:

Feb 28, 2003, 10:56:00 AM (23 years ago)

Author:

sandervl

Message:

PF: Wrong checks on restoration point remembering. Maximizing window from PM icon using keyboard or menu produced wrong controls

Location:

trunk/src/user32

Files:

• win32wbase.cpp (modified) (2 diffs)
• win32wbasenonclient.cpp (modified) (2 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.360 2003-02-27 14:22:44 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.361 2003-02-28 09:56:00 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2579 +2579 @@
             NotifyFrameChanged(&wpos, &oldClientRect);
         }
-        if(!fShowWindow && !(getStyle() & WS_MINIMIZE))
+        if(!fShowWindow && !(getStyle() & WS_MINIMIZE) && !(fuFlags & (SWP_NOSIZE | SWP_NOMOVE)))
         {
             //Restore position always changes when the window position is changed

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.49 2003-02-27 14:22:45 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.50 2003-02-28 09:56:00 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -1332 +1332 @@
     case SC_MAXIMIZE:
         if(dwStyle & WS_MAXIMIZEBOX)
-           ShowWindow(SW_MAXIMIZE);
+          if (fOS2Look && (getOldStyle() & WS_MINIMIZE))
+          {
+              //PF Yes this is bad we do things twice - first restore window
+              //from iconic state and then quickly maximize. What is good is that
+              //only frame rects are recalculated twice. I checked lots of other
+              //ways - seems only this one is 100% bug-safe. This happens on every
+              //minimize from icon to maximum routine so not so often at all.
+              OSLibWinRestoreWindow(getOS2FrameWindowHandle());
+          }
+          ShowWindow(SW_MAXIMIZE);
         break;