Changeset 5246 for trunk/src/user32/win32wbase.cpp

Timestamp:

Feb 22, 2001, 7:18:59 PM (25 years ago)

Author:

sandervl

Message:

minimize updates + update region fix in NotifyFrameChanged

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.242 2001-02-22 10:37:31 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.243 2001-02-22 18:18:59 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2180 +2180 @@
  BOOL  rc,wasVisible,showFlag;
  RECT  newPos = {0, 0, 0, 0};
- BOOL  fInvalidate = FALSE;
 
     dprintf(("ShowWindow %x %x", getWindowHandle(), nCmdShow));
@@ -2200 +2199 @@
         /* fall through */
     case SW_MINIMIZE:
-//testesteest
         if(!(getStyle() & WS_CHILD))
         {
@@ -2212 +2210 @@
             if( !(getStyle() & WS_MINIMIZE) ) {
                  swp |= MinMaximize(SW_MINIMIZE, &newPos );
-                 fInvalidate = TRUE;
             }
             else swp |= SWP_NOSIZE | SWP_NOMOVE;
         }
-//testesteest
         break;
 
@@ -2253 +2249 @@
          swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
 
-         if( getStyle() & (WS_MINIMIZE | WS_MAXIMIZE) )
+         if( getStyle() & (WS_MINIMIZE | WS_MAXIMIZE) ) {
               swp |= MinMaximize(SW_RESTORE, &newPos );
+         }
          else swp |= SWP_NOSIZE | SWP_NOMOVE;
          break;
@@ -2292 +2289 @@
                               rectClient.bottom-rectClient.top));
         SendInternalMessageA(WM_MOVE,0,MAKELONG(rectClient.left,rectClient.top));
-    }
-    if(fInvalidate) {
-        InvalidateRect(getWindowHandle(), NULL, 1);
     }
 END:
@@ -2519 +2513 @@
     else SendInternalMessageA(WM_WINDOWPOSCHANGED, 0, (LPARAM)wpos);
 
+    //Calculate invalid areas
     rect = rectWindow;
     OffsetRect(&rect, -rectWindow.left, -rectWindow.top);
@@ -2527 +2522 @@
     }
     rect = rectClient;
-    OffsetRect(&rect, -rectClient.left, -rectClient.top);
     hrgnClient = CreateRectRgnIndirect(&rect);
     if (!hrgn) {
@@ -2538 +2532 @@
     if(!EqualRect(oldClientRect, &rectClient)) {
          UnionRect(oldClientRect, oldClientRect, &rectClient);
-         OffsetRect(oldClientRect, -rectClient.left, -rectClient.top);
          hrgnClient = CreateRectRgnIndirect(oldClientRect);
          if (!hrgn) {
@@ -2547 +2540 @@
          DeleteObject(hrgnClient);
     }
-    InvalidateRgn(getWindowHandle(), hrgn, TRUE);
+    RedrawWindow(getWindowHandle(), NULL, hrgn, RDW_ALLCHILDREN |
+                 RDW_INVALIDATE | RDW_ERASE | RDW_FRAME);
     DeleteObject(hrgn);
 }