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

Timestamp:

Mar 20, 2002, 11:30:08 AM (23 years ago)

Author:

sandervl

Message:

Changes & fixes for minimized windows

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.317 2002-03-18 15:26:30 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.318 2002-03-20 10:30:07 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1280 +1280 @@
        (pUpdateRect->right >= client.left) && (pUpdateRect->right < client.right) &&
        (pUpdateRect->top  >= client.top) && (pUpdateRect->top < client.bottom) &&
-       (pUpdateRect->bottom >= client.top) && (pUpdateRect->bottom < client.bottom))
+       (pUpdateRect->bottom >= client.top) && (pUpdateRect->bottom < client.bottom)
+       && (!(getStyle() & WS_MINIMIZE)))
     {
         return 0;
@@ -1289 +1290 @@
 
     rc = SendMessageA(getWindowHandle(),WM_NCPAINT, hrgn, 0);
+    //Send WM_PAINTICON here if minimized, because client window will
+    //not receive a (valid) WM_PAINT message
+    if (getStyle() & WS_MINIMIZE) 
+    {
+        rc = SendMessageA(getWindowHandle(),WM_PAINTICON, 1, 0);
+    }
 
     DeleteObject(hrgn);
@@ -1788 +1795 @@
     case WM_PRINT:
         return DefWndPrint(wParam,lParam);
+
+    case WM_SYNCPAINT:
+        RedrawWindow(getWindowHandle(), NULL, 0, RDW_ERASENOW | RDW_ERASE | RDW_ALLCHILDREN);
+        return 0;
 
     case WM_PAINTICON:
@@ -2277 +2288 @@
     case SW_RESTORE:
          dprintf(("ShowWindow:restoring window"));
-         //Set client rectangle to 0 (contains negative values)
-         setClientRect(0,0,0,0);
 
          swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
@@ -2300 +2309 @@
         swp |= SWP_NOACTIVATE | SWP_NOZORDER;
 
-    SetWindowPos(HWND_TOP, newPos.left, newPos.top, newPos.right, newPos.bottom, LOWORD(swp));
+    dprintf(("ShowWindow : SetWindowPos now"));   
+    if (!(getStyle() & WS_MINIMIZE)) {
+         SetWindowPos(HWND_TOP, newPos.left, newPos.top, newPos.right, newPos.bottom, LOWORD(swp));
+    }
+    else OSLibWinMinimizeWindow(getOS2FrameWindowHandle());
 
     if(!(swp & SWP_NOACTIVATE)) {