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

Timestamp:

Feb 21, 2001, 9:51:07 PM (25 years ago)

Author:

sandervl

Message:

fixes for minimizing frame windows + WM_BUTTONxMOTIONSTART/END handling

File:

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

trunk/src/user32/win32wbasepos.cpp

@@ -1 @@
-/* $Id: win32wbasepos.cpp,v 1.19 2001-02-20 15:40:23 sandervl Exp $ */
+/* $Id: win32wbasepos.cpp,v 1.20 2001-02-21 20:51:07 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (nonclient/position methods)
@@ -227 +227 @@
 
     if(IsRectEmpty(&windowpos.rcNormalPosition)) {
-    CopyRect(&windowpos.rcNormalPosition, &rectWindow);
+        CopyRect(&windowpos.rcNormalPosition, &rectWindow);
     }
     if(!HOOK_CallHooksA(WH_CBT, HCBT_MINMAX, getWindowHandle(), cmd))
     {
-    if(getStyle() & WS_MINIMIZE )
-    {
-        if(!SendInternalMessageA(WM_QUERYOPEN, 0, 0L))
-        return (SWP_NOSIZE | SWP_NOMOVE);
-    }
-    switch( cmd )
-    {
+        if(getStyle() & WS_MINIMIZE )
+        {
+            if(!SendInternalMessageA(WM_QUERYOPEN, 0, 0L))
+                return (SWP_NOSIZE | SWP_NOMOVE);
+        }
+        switch( cmd )
+        {
         case SW_MINIMIZE:
-        if( getStyle() & WS_MAXIMIZE)
-        {
-                setFlags(getFlags() | WIN_RESTORE_MAX);
-                setStyle(getStyle() & ~WS_MAXIMIZE);
-                }
-                else    setFlags(getFlags() & ~WIN_RESTORE_MAX);
-
-        setStyle(getStyle() | WS_MINIMIZE);
-
-        SetRect(lpRect, windowpos.ptMinPosition.x, windowpos.ptMinPosition.y,
-                GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON) );
-        break;
+            if( getStyle() & WS_MAXIMIZE)
+            {
+                 setFlags(getFlags() | WIN_RESTORE_MAX);
+                 setStyle(getStyle() & ~WS_MAXIMIZE);
+            }
+            else setFlags(getFlags() & ~WIN_RESTORE_MAX);
+
+            setStyle(getStyle() | WS_MINIMIZE);
+
+            SetRect(lpRect, windowpos.ptMinPosition.x, windowpos.ptMinPosition.y,
+                    GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON) );
+            break;
 
         case SW_MAXIMIZE:
-                GetMinMaxInfo(&size, &windowpos.ptMaxPosition, NULL, NULL );
-
-        if(getStyle() & WS_MINIMIZE )
-        {
-             setStyle(getStyle() & ~WS_MINIMIZE);
-        }
-                setStyle(getStyle() | WS_MAXIMIZE);
-
-        SetRect(lpRect, windowpos.ptMaxPosition.x, windowpos.ptMaxPosition.y,
-                size.x, size.y );
-        break;
+            GetMinMaxInfo(&size, &windowpos.ptMaxPosition, NULL, NULL );
+
+            if(getStyle() & WS_MINIMIZE )
+            {
+                 setStyle(getStyle() & ~WS_MINIMIZE);
+            }
+            setStyle(getStyle() | WS_MAXIMIZE);
+
+            SetRect(lpRect, windowpos.ptMaxPosition.x, windowpos.ptMaxPosition.y,
+                    size.x, size.y );
+            break;
 
         case SW_RESTORE:
-        if(getStyle() & WS_MINIMIZE)
-        {
+            if(getStyle() & WS_MINIMIZE)
+            {
                 setStyle(getStyle() & ~WS_MINIMIZE);
 
                 if( getFlags() & WIN_RESTORE_MAX)
                 {
-                /* Restore to maximized position */
-                            GetMinMaxInfo(&size, &windowpos.ptMaxPosition, NULL, NULL);
-                setStyle(getStyle() | WS_MAXIMIZE);
-                SetRect(lpRect, windowpos.ptMaxPosition.x, windowpos.ptMaxPosition.y, size.x, size.y);
-                break;
+                    /* Restore to maximized position */
+                    GetMinMaxInfo(&size, &windowpos.ptMaxPosition, NULL, NULL);
+                    setStyle(getStyle() | WS_MAXIMIZE);
+                    SetRect(lpRect, windowpos.ptMaxPosition.x, windowpos.ptMaxPosition.y, size.x, size.y);
+                    break;
                 }
-        }
-        else
+            }
+            else
             if( !(getStyle() & WS_MAXIMIZE) )
-            return 0;
-            else    setStyle(getStyle() & ~WS_MAXIMIZE);
-
-        /* Restore to normal position */
-
-        *lpRect = windowpos.rcNormalPosition;
-        lpRect->right -= lpRect->left;
-        lpRect->bottom -= lpRect->top;
-        break;
-    }
+                 return 0;
+            else setStyle(getStyle() & ~WS_MAXIMIZE);
+
+            /* Restore to normal position */
+            *lpRect = windowpos.rcNormalPosition;
+            lpRect->right -= lpRect->left;
+            lpRect->bottom -= lpRect->top;
+            break;
+        }
     }
     else swpFlags |= SWP_NOSIZE | SWP_NOMOVE;