Changeset 3783 for trunk/src

Timestamp:

Jul 1, 2000, 11:51:53 AM (25 years ago)

Author:

sandervl

Message:

moving child window when old window smaller than client area & resized

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (4 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.96 2000-06-29 12:26:00 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.97 2000-07-01 09:51:52 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -339 +339 @@
                 if(pswp->fl & SWP_ACTIVATE)
                 {
-                        WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+                        if(!(WinQueryWindowUShort(hwnd,QWS_FLAGS) & FF_ACTIVE)) {
+                                WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+                        }
                 }
                 goto RunDefWndProc;
@@ -364 +366 @@
         if(pswp->fl & SWP_ACTIVATE)
         {
-             WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+             if(!(WinQueryWindowUShort(hwnd,QWS_FLAGS) & FF_ACTIVE)) {
+                WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+             }
         }
 
@@ -690 +694 @@
 
         rc = WinQueryUpdateRect(hwnd, &rectl);
-        dprintf(("OS2: WM_PAINT (%d,%d) (%d,%d)", rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop));
+        dprintf(("OS2: WM_PAINT %x (%d,%d) (%d,%d)", win32wnd->getWindowHandle(), rectl.xLeft, rectl.yBottom, rectl.xRight, rectl.yTop));
         if(rc && win32wnd->IsWindowCreated() && (rectl.xLeft != rectl.xRight &&
            rectl.yBottom != rectl.yTop)) 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.203 2000-06-29 12:26:01 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.204 2000-07-01 09:51:53 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1111 +1111 @@
   dprintf(("MsgFormatFrame: old client rect (%d,%d)(%d,%d), new client (%d,%d)(%d,%d)", client.left, client.top, client.right, client.bottom, rectClient.left, rectClient.top, rectClient.right, rectClient.bottom));
   dprintf(("MsgFormatFrame: old window rect (%d,%d)(%d,%d), new window (%d,%d)(%d,%d)", oldWindowRect.left, oldWindowRect.top, oldWindowRect.right, oldWindowRect.bottom, rectWindow.left, rectWindow.top, rectWindow.right, rectWindow.bottom));
+
+#if 1
+//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))
+  {
+   Win32BaseWindow *child = (Win32BaseWindow *)getFirstChild();
+
+        //client rectangle has moved -> inform children
+        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);
+                child = (Win32BaseWindow *)child->getNextChild();
+        }
+  }
+#endif
   return rc;
 }