Changeset 4628 for trunk/src/user32

Timestamp:

Nov 19, 2000, 12:52:41 PM (25 years ago)

Author:

sandervl

Message:

SetWindowPos fixes for SWP_FRAMECHANGED

Location:

trunk/src/user32

Files:

• oslibgdi.h (modified) (2 diffs)
• win32wbase.cpp (modified) (3 diffs)
• win32wbase.h (modified) (2 diffs)

trunk/src/user32/oslibgdi.h

@@ -1 @@
-/* $Id: oslibgdi.h,v 1.7 2000-06-08 18:10:10 sandervl Exp $ */
+/* $Id: oslibgdi.h,v 1.8 2000-11-19 11:52:39 sandervl Exp $ */
 /*
  * Window GDI wrapper functions for OS/2
@@ -112 +112 @@
 INT  mapOS2ToWin32ChildOrigin(INT parentH,INT parentPosY,INT childH);
 
+#define RECT_WIDTH(a)   ((a).right - (a).left)
+#define RECT_HEIGHT(a)  ((a).bottom - (a).top)
+
 #endif //__OSLIBGDI_H__

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.222 2000-11-17 09:56:54 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.223 2000-11-19 11:52:40 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2313 +2313 @@
         if(fuFlags & SWP_FRAMECHANGED)
         {
-            MsgFormatFrame(NULL);
-            UnionRect(&oldClientRect, &oldClientRect, &rectClient);
-            OffsetRect(&oldClientRect, -rectClient.left, -rectClient.top);
-            InvalidateRect(getWindowHandle(), &oldClientRect, TRUE);
+            NotifyFrameChanged(&wpos, &oldClientRect);
         }
         return TRUE;
@@ -2361 +2358 @@
     if((fuFlags & SWP_FRAMECHANGED) && (fuFlags & (SWP_NOMOVE | SWP_NOSIZE) == (SWP_NOMOVE | SWP_NOSIZE)))
     {
-        MsgFormatFrame(NULL);
-        UnionRect(&oldClientRect, &oldClientRect, &rectClient);
-        OffsetRect(&oldClientRect, -rectClient.left, -rectClient.top);
-        InvalidateRect(getWindowHandle(), &oldClientRect, TRUE);
+            NotifyFrameChanged(&wpos, &oldClientRect);
     }
     return (rc);
+}
+//******************************************************************************
+//******************************************************************************
+void Win32BaseWindow::NotifyFrameChanged(WINDOWPOS *wpos, RECT *oldClientRect)
+{
+    MsgFormatFrame(NULL);
+    if(RECT_WIDTH(rectClient) != RECT_WIDTH(*oldClientRect) || 
+       RECT_HEIGHT(rectClient) != RECT_HEIGHT(*oldClientRect)) 
+    {
+         wpos->flags &= ~SWP_NOSIZE;
+    }
+
+    WINDOWPOS wpOld = *wpos;
+    SendInternalMessageA(WM_WINDOWPOSCHANGING, 0, (LPARAM)wpos);
+
+    UnionRect(oldClientRect, oldClientRect, &rectClient);
+    OffsetRect(oldClientRect, -rectClient.left, -rectClient.top);
+    InvalidateRect(getWindowHandle(), oldClientRect, TRUE);
+
+    if ((wpos->hwndInsertAfter != wpOld.hwndInsertAfter) ||
+        (wpos->x != wpOld.x) || (wpos->y != wpOld.y) || (wpos->cx != wpOld.cx) || (wpos->cy != wpOld.cy) || (wpos->flags != wpOld.flags))
+    {
+         dprintf(("WARNING, NotifyFrameChanged: TODO -> adjust flags!!!!"));
+         SetWindowPos(wpos->hwndInsertAfter, wpos->x, wpos->y, wpos->cx, wpos->cy, wpos->flags | SWP_NOSENDCHANGING);
+    }
+    else SendInternalMessageA(WM_WINDOWPOSCHANGED, 0, (LPARAM)wpos);
 }
 //******************************************************************************

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.100 2000-11-05 18:49:09 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.101 2000-11-19 11:52:41 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -313 +313 @@
         void    Init();
 
+        void    NotifyFrameChanged(WINDOWPOS *wpos, RECT *oldClientRect);
+
         //called in destructor to remove all (if any) window properties
         void    removeWindowProps();