Changeset 6395 for trunk/src/user32/window.cpp

Timestamp:

Jul 28, 2001, 3:43:54 PM (24 years ago)

Author:

sandervl

Message:

rewrote some functions

File:

• trunk/src/user32/window.cpp (modified) (3 diffs)

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.101 2001-07-23 19:16:41 sandervl Exp $ */
+/* $Id: window.cpp,v 1.102 2001-07-28 13:43:54 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -18 +18 @@
  * TODO: ShowOwnedPopups needs to be tested
  *       GetLastActivePopup needs to be rewritten
- *       ArrangeIconicWindows probably too
  *
  */
@@ -1745 +1744 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API ArrangeIconicWindows( HWND hwnd)
-{
-    dprintf(("USER32:  ArrangeIconicWindows %x", hwnd));
-    return O32_ArrangeIconicWindows(Win32ToOS2Handle(hwnd));
+UINT WIN32API ArrangeIconicWindows( HWND parent)
+{
+    RECT rectParent;
+    HWND hwndChild;
+    INT x, y, xspacing, yspacing;
+
+    dprintf(("USER32: ArrangeIconicWindows %x", parent));
+    dprintf(("USER32: TODO: icon title!!"));
+
+    GetClientRect(parent, &rectParent);
+    x = rectParent.left;
+    y = rectParent.bottom;
+    xspacing = GetSystemMetrics(SM_CXICONSPACING);
+    yspacing = GetSystemMetrics(SM_CYICONSPACING);
+
+    hwndChild = GetWindow( parent, GW_CHILD );
+    while (hwndChild)
+    {
+        if( IsIconic( hwndChild ) )
+        {
+//            WND *wndPtr = WIN_FindWndPtr(hwndChild);
+            
+//            WINPOS_ShowIconTitle( wndPtr, FALSE );
+               
+            SetWindowPos( hwndChild, 0, x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2,
+                            y - yspacing - GetSystemMetrics(SM_CYICON)/2, 0, 0,
+                            SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE );
+//          if( IsWindow(hwndChild) )
+//                WINPOS_ShowIconTitle(wndPtr , TRUE );
+//            WIN_ReleaseWndPtr(wndPtr);
+
+            if (x <= rectParent.right - xspacing) x += xspacing;
+            else
+            {
+                x = rectParent.left;
+                y -= yspacing;
+            }
+        }
+        hwndChild = GetWindow( hwndChild, GW_HWNDNEXT );
+    }
+    return yspacing;
 }
 //******************************************************************************