Changeset 5189 for trunk/src

Timestamp:

Feb 19, 2001, 11:15:52 AM (25 years ago)

Author:

sandervl

Message:

Invalidation after resize fix

Location:

trunk/src/user32

Files:

• dc.cpp (modified) (4 diffs)
• pmwindow.cpp (modified) (5 diffs)

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.88 2001-02-18 17:59:04 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.89 2001-02-19 10:15:49 sandervl Exp $ */
 
 /*
@@ -428 +428 @@
    hrgnRect = GreCreateRectRegion(pHps->hps, &rcl, 1);
 #if 0
-   if(window->getParent()) 
+   if(window->getParent())
    {
      HRGN hrgnParentClip;
@@ -1740 +1740 @@
                 {
                      dprintf(("ScrollWindowEx: Scroll child window %x", hwndChild));
-                     SetWindowPos(hwndChild, 0, rectChild.left + dx,
-                                  rectChild.top + orgdy, 0, 0, SWP_NOZORDER_W |
-                                  SWP_NOSIZE_W | SWP_NOACTIVATE_W | SWP_NOREDRAW);
+                     SetWindowPos(hwndChild, 0, rectChild.left + dx,
+                                  rectChild.top + orgdy, 0, 0, SWP_NOZORDER_W |
+                                  SWP_NOSIZE_W | SWP_NOACTIVATE_W | SWP_NOREDRAW);
                 }
                 hwndChild = GetWindow(hwndChild, GW_HWNDNEXT_W);
@@ -1843 +1843 @@
     if(!pHps)
     {
-        return;
+    return;
     }
 

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.116 2001-02-18 14:18:38 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.117 2001-02-19 10:15:52 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -438 +438 @@
           //CB: todo: use result for WM_CALCVALIDRECTS
           //Get old client rectangle (for invalidation of frame window parts later on)
-          mapWin32ToOS2Rect(win32wnd->getWindowHeight(), win32wnd->getClientRectPtr(), (PRECTLOS2)&rect);
+          //Use new window height to calculate the client area
+          mapWin32ToOS2Rect(pswp->cy, win32wnd->getClientRectPtr(), (PRECTLOS2)&rect);
 
           //Note: Also updates the new window rectangle
@@ -474 +475 @@
 
               WinQueryWindowRect(hwnd,&frame);
+
                //top
               arcl[0].xLeft = 0;
@@ -1238 +1240 @@
         if(!WinEqualRect(0, &rcl, &track.rclTrack)) {
             dprintf(("FrameTrackFrame: new (os/2) window rect: (%d,%d)(%d,%d)", track.rclTrack.xLeft, track.rclTrack.yBottom, track.rclTrack.xRight - track.rclTrack.xLeft, track.rclTrack.yTop - track.rclTrack.yBottom));
-        if(flags == TF_MOVE) {
-            WinSetWindowPos(win32wnd->getOS2WindowHandle(),
-                                        0, track.rclTrack.xLeft, track.rclTrack.yBottom,
-                                        0, 0, SWP_MOVE);
-        }
-        else {
+            if(flags == TF_MOVE) {
+                WinSetWindowPos(win32wnd->getOS2WindowHandle(),
+                                0, track.rclTrack.xLeft, track.rclTrack.yBottom,
+                                0, 0, SWP_MOVE);
+            }
+            else {
               SetWindowPos(win32wnd->getWindowHandle(), 0, track.rclTrack.xLeft,
                            parentHeight - track.rclTrack.yTop,
@@ -1249 +1251 @@
                            track.rclTrack.yTop - track.rclTrack.yBottom,
                            SWP_NOACTIVATE_W | SWP_NOZORDER_W | SWP_NOACTIVATE_W);
-//            WinSetWindowPos(win32wnd->getOS2WindowHandle(),
-//                                        0, track.rclTrack.xLeft, track.rclTrack.yBottom,
-//                                        track.rclTrack.xRight - track.rclTrack.xLeft,
-//                                        track.rclTrack.yTop - track.rclTrack.yBottom,
-//                                        SWP_SIZE|SWP_MOVE);
-        }
+//                WinSetWindowPos(win32wnd->getOS2WindowHandle(),
+//                                0, track.rclTrack.xLeft, track.rclTrack.yBottom,
+//                               track.rclTrack.xRight - track.rclTrack.xLeft,
+//                                track.rclTrack.yTop - track.rclTrack.yBottom,
+//                                SWP_SIZE|SWP_MOVE);
+            }
         }
         return;