Changeset 3341 for trunk/src/user32/win32wbasenonclient.cpp

Timestamp:

Apr 7, 2000, 2:55:16 PM (25 years ago)

Author:

sandervl

Message:

clip fix for WM_NCPAINT

File:

• trunk/src/user32/win32wbasenonclient.cpp (modified) (4 diffs)

trunk/src/user32/win32wbasenonclient.cpp

@@ -1 @@
-/* $Id: win32wbasenonclient.cpp,v 1.20 2000-04-07 10:01:18 sandervl Exp $ */
+/* $Id: win32wbasenonclient.cpp,v 1.21 2000-04-07 12:55:16 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2 (non-client methods)
@@ -972 +972 @@
     DrawTextExA(memDC,buffer,-1,&r,DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX | DT_LEFT | DT_END_ELLIPSIS,NULL);
     DeleteObject (SelectObject (memDC, hOldFont));
+    IncreaseLogCount();
+    dprintf(("DrawCaption %s %d", buffer, active));
+    DecreaseLogCount();
   }
 
@@ -997 +1000 @@
   DecreaseLogCount();
 
+  rect.top    = rect.left = 0;
+  rect.right  = rectWindow.right - rectWindow.left;
+  rect.bottom = rectWindow.bottom - rectWindow.top;
+
+  if (clip > 1)
+  {
+    //only redraw caption
+    GetRgnBox(clip,&rectClip);
+    //SvL: I'm getting paint problems when clipping a dc created in GetDCEx
+    //     with a region that covers the entire window (RealPlayer 7 Update 1)
+    //     As we don't need to clip anything when that occurs, this workaround
+    //     solves the problem.
+    if(rectClip.right == getWindowWidth() && rectClip.bottom == getWindowHeight()) 
+    {
+        clip = 0;
+        rectClip = rect;
+    }
+  }
+  else
+  {
+    clip = 0;
+    rectClip = rect;
+  }
+
   if (!(hdc = GetDCEx( Win32Hwnd, (clip > 1) ? clip : 0, DCX_USESTYLE | DCX_WINDOW |
                       ((clip > 1) ?(DCX_INTERSECTRGN /*| DCX_KEEPCLIPRGN*/) : 0) ))) return;
-
-  rect.top = rect.left = 0;
-  rect.right  = rectWindow.right - rectWindow.left;
-  rect.bottom = rectWindow.bottom - rectWindow.top;
-
-  if (clip > 1)
-  {
-    //only redraw caption
-    GetRgnBox(clip,&rectClip);
-  }
-  else
-  {
-    clip = 0;
-    rectClip = rect;
-  }
 
   SelectObject( hdc, GetSysColorPen(COLOR_WINDOWFRAME) );
@@ -1044 +1056 @@
       rect.top += GetSystemMetrics(SM_CYCAPTION);
     }
-    if( !clip || IntersectRect( &rfuzz, &r, &rectClip ) )
+    if( !clip || IntersectRect( &rfuzz, &r, &rectClip ) ) 
       DrawCaption(hdc,&r,active);
   }