Changeset 20581

Timestamp:

Apr 28, 2003, 10:41:08 AM (22 years ago)

Author:

sandervl

Message:

PF: Correctly finish PM restore procedure from minimized state; Use Stock brush for minimized icon fill when it is not allocated

Location:

tags/trunk/src/user32

Files:

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

tags/trunk/src/user32/pmwindow.cpp ¶

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.211 2003-04-25 11:13:16 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.212 2003-04-28 08:41:07 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1680 +1680 @@
         }
 #endif
+        //PF This is the final step of PM restoration - should end up
+        //in default handler.
+        if (win32wnd->getOldStyle() & WS_MINIMIZE_W && pswp->fl & SWP_RESTORE)
+              goto RunDefFrameWndProc;
 
 PosChangedEnd:

tags/trunk/src/user32/win32wbase.cpp ¶

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.368 2003-04-24 13:59:14 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.369 2003-04-28 08:41:08 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1831 +1831 @@
     case WM_ICONERASEBKGND:
     {
-      RECT rect;
-      int rc;
-
-        if (!windowClass || !windowClass->getBackgroundBrush()) return 0;
+      HBRUSH hBrush;
+      RECT   rect;
+      int    rc;
+     
+        if (!windowClass || (!windowClass->getBackgroundBrush() 
+                              && !(getStyle() & WS_MINIMIZE))) return 0;
+
+        //PF For PM desktop/MDI icons allocate brush as well to avoid
+        //garbage in icons
+
+        if (!windowClass->getBackgroundBrush())
+            hBrush = GetStockObject(GRAY_BRUSH);
+        else
+        {
+            hBrush = windowClass->getBackgroundBrush();
+            if (hBrush <= (HBRUSH)(SYSCOLOR_GetLastColor()+1))
+                hBrush = GetSysColorBrush(hBrush-1);
+        }
+             
 
         rc = GetClipBox( (HDC)wParam, &rect );
         if ((rc == SIMPLEREGION) || (rc == COMPLEXREGION))
-        {
-            HBRUSH hBrush = windowClass->getBackgroundBrush();
-
-            if (hBrush <= (HBRUSH)(SYSCOLOR_GetLastColor()+1))
-                hBrush = GetSysColorBrush(hBrush-1);
-
             FillRect( (HDC)wParam, &rect, hBrush);
-        }
+
         return 1;
     }