Changeset 8042 for trunk/src/user32/win32wbasepos.cpp

Timestamp:

Mar 7, 2002, 8:41:18 PM (23 years ago)

Author:

sandervl

Message:

PF: CloseWindow + minimize fixes

File:

• trunk/src/user32/win32wbasepos.cpp (modified) (4 diffs)

trunk/src/user32/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.27 2002-02-05 17:59:01 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.28 2002-03-07 19:41:18 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -190 +190 @@
 LONG Win32BaseWindow::HandleWindowPosChanging(WINDOWPOS *winpos)
 {
-    POINT maxSize;
+    POINT maxSize, maxTrack, minTrack;
     if (winpos->flags & SWP_NOSIZE) return 0;
 
@@ -196 +196 @@
         ((dwStyle & (WS_POPUP | WS_CHILD)) == 0))
     {
-        GetMinMaxInfo( &maxSize, NULL, NULL, NULL );
-        winpos->cx = MIN( winpos->cx, maxSize.x );
-        winpos->cy = MIN( winpos->cy, maxSize.y );
+        GetMinMaxInfo( &maxSize, NULL, &minTrack, &maxTrack );
+        winpos->cx = MIN( winpos->cx, MAX( maxSize.x, maxTrack.x) );
+        winpos->cy = MIN( winpos->cy, MAX( maxSize.y, maxTrack.y) );
+        if (!(dwStyle & WS_MINIMIZE))
+        {
+            if (winpos->cx < minTrack.x ) winpos->cx = minTrack.x;
+            if (winpos->cy < minTrack.y ) winpos->cy = minTrack.y;
+        }
     }
     return 0;
@@ -309 +314 @@
 
             if(getParent() == NULL) {
-                SetRect(lpRect, -32000, -32000, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON));
-                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), getStyle(), getExStyle());
+// @@PF : for now disable windows style - it messes with WV minimize - will fix it soon
+                 SetRect(lpRect, -32000, -32000, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON));
+//                OSLibSetWindowStyle(getOS2FrameWindowHandle(), getOS2WindowHandle(), getStyle(), getExStyle());
+                CloseWindow(); 
             }
             else {