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

Timestamp:

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

Author:

sandervl

Message:

Changes & fixes for minimized windows

File:

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

trunk/src/user32/dc.cpp

@@ -1 @@
-/* $Id: dc.cpp,v 1.115 2001-12-30 10:47:43 sandervl Exp $ */
+/* $Id: dc.cpp,v 1.116 2002-03-20 10:30:06 sandervl Exp $ */
 
 /*
@@ -660 +660 @@
  RECTL    rectlClient;
  RECTL    rectlClip;
+ BOOL     bIcon;
 
     if(lpps == NULL) {
@@ -675 +676 @@
         return (HDC)0;
     }
-    HWND hwndClient = wnd->getOS2WindowHandle();
-
-    if(hwnd != HWND_DESKTOP && wnd->isOwnDC())
+//    bIcon = (IsIconic(hwnd) && GetClassLongA(hWnd, GCL_HICON_W));
+    bIcon = IsIconic(hwnd);
+
+    HWND hwndClient = (bIcon) ? wnd->getOS2FrameWindowHandle() : wnd->getOS2WindowHandle();
+
+    if(hwnd != HWND_DESKTOP && !bIcon && wnd->isOwnDC())
     {
         hPS_ownDC = wnd->getOwnDC();
@@ -694 +698 @@
     }
     if(!hpsPaint) {
-        hpsPaint = GetDCEx(hwnd, 0, (DCX_CACHE_W|DCX_USESTYLE_W));
+        hpsPaint = GetDCEx(hwnd, 0, (DCX_CACHE_W|DCX_USESTYLE_W | ((bIcon) ? DCX_WINDOW_W : 0)));
         pHps = (pDCData)GpiQueryDCData(hpsPaint);
         if (!pHps)
@@ -710 +714 @@
         dprintf (("USER32: WARNING: WinQueryUpdateRect failed (error or no update rectangle)!!"));
 
+        if(bIcon) {
+            //WinBeginPaint messes this up for icon windows; this isn't
+            //a good solution, but it does the job
+            //Use the entire frame window as clip region
+            rectl.xRight = wnd->getWindowWidth();
+            rectl.yTop   = wnd->getWindowHeight();
+        }
+
         HRGN hrgnClip = GpiCreateRegion(pHps->hps, 1, &rectl);
         GpiSetClipRegion(pHps->hps, hrgnClip, &hrgnOldClip);
@@ -717 +729 @@
         //save old clip region (restored for CS_OWNDC windows in EndPaint)
         wnd->SetClipRegion(hrgnOldClip);
-        lComplexity = RGN_NULL;
+        if(bIcon) {
+              lComplexity = RGN_RECT;
+        }
+        else  lComplexity = RGN_NULL;
     }
     else {