Changeset 3789 for trunk/src

Timestamp:

Jul 2, 2000, 4:31:34 PM (25 years ago)

Author:

sandervl

Message:

fixed moving of child windows + move child windows when client rectangle changes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.204 2000-07-01 09:51:53 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.205 2000-07-02 14:31:34 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1115 +1115 @@
 //this doesn't always work 
 //  if(!fNoSizeMsg && (client.left != rectClient.left || client.top != rectClient.top)) 
-  if(!fNoSizeMsg && (oldWindowRect.right - oldWindowRect.left < rectClient.left 
-                  || oldWindowRect.bottom - oldWindowRect.top < rectClient.top))
+  if(!fNoSizeMsg && ((oldWindowRect.right - oldWindowRect.left < rectClient.left 
+                  || oldWindowRect.bottom - oldWindowRect.top < rectClient.top) ||
+     (EqualRect(&oldWindowRect, &rectWindow) && (client.left != rectClient.left || client.top != rectClient.top))))
   {
    Win32BaseWindow *child = (Win32BaseWindow *)getFirstChild();
@@ -1123 +1124 @@
         dprintf(("MsgFormatFrame -> client rectangle has changed, move children"));
         while(child) {
-                child->SetWindowPos(HWND_TOP, child->getClientRectPtr()->left, 
-                                    child->getClientRectPtr()->top, 0, 0, 
-                                    SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER);
+                ::SetWindowPos(child->getWindowHandle(), 
+                               HWND_TOP, child->getWindowRect()->left, 
+                               child->getWindowRect()->top, 0, 0, 
+                               SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOZORDER);
                 child = (Win32BaseWindow *)child->getNextChild();
         }
@@ -2271 +2273 @@
                 OffsetRect(&oldClientRect, -rectClient.left, -rectClient.top);
                 InvalidateRect(getWindowHandle(), &oldClientRect, TRUE);
-//TODO: move child windows!!
         }
         return TRUE;
@@ -2317 +2318 @@
         OffsetRect(&oldClientRect, -rectClient.left, -rectClient.top);
         InvalidateRect(getWindowHandle(), &oldClientRect, TRUE);
-//TODO: move child windows!!
     }
     return (rc);