Author: jackson
Date: 2006-05-18 19:49:31 -0400 (Thu, 18 May 2006)
New Revision: 60853

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
Log:

        * ThemeWin32Classic.cs: Don't use endcaps, they mess the drawing
        up.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-05-18 23:30:05 UTC (rev 60852)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-05-18 23:49:31 UTC (rev 60853)
@@ -1,3 +1,8 @@
+2006-05-18  Jackson Harper  <[EMAIL PROTECTED]>
+
+       * ThemeWin32Classic.cs: Don't use endcaps, they mess the drawing
+       up.
+
 2006-05-18  Peter Dennis Bartok  <[EMAIL PROTECTED]> 
 
        * Control.cs: Brought back our old UpdateZOrder method as a private
@@ -4,6 +9,13 @@
          function and switched our calls from UpdateZOrder to the new one.
          This fixes the Paint.Net canvas disappearing bug.
 
+2006-05-18  Jackson Harper  <[EMAIL PROTECTED]>
+
+       * Theme.cs:
+       * ThemeWin32Classic.cs:
+       * InternalWindowManager.cs: Move the drawing into the theme,
+       expose everything the theme should need from the window manager.
+
 2006-05-18  Peter Dennis Bartok  <[EMAIL PROTECTED]>
 
        * XplatUIX11.cs (DefWndProc): WM_SETCURSOR: Assign the return value 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs 
    2006-05-18 23:30:05 UTC (rev 60852)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs 
    2006-05-18 23:49:31 UTC (rev 60853)
@@ -5387,10 +5387,6 @@
                private void DrawCaptionHelper(Graphics graphics, Color color, 
Pen pen, int lineWidth, int shift, Rectangle captionRect, CaptionButton button) 
{
                        switch(button) {
                        case CaptionButton.Close: {
-                               LineCap oldStartCap = pen.StartCap;
-                               LineCap oldEndCap = pen.EndCap;
-                               pen.StartCap=LineCap.Triangle;
-                               pen.EndCap=LineCap.Triangle;
                                if (lineWidth<2) {
                                        graphics.DrawLine(pen, 
captionRect.Left+2*lineWidth+1+shift, captionRect.Top+2*lineWidth+shift, 
captionRect.Right-2*lineWidth+1+shift, captionRect.Bottom-2*lineWidth+shift);
                                        graphics.DrawLine(pen, 
captionRect.Right-2*lineWidth+1+shift, captionRect.Top+2*lineWidth+shift, 
captionRect.Left+2*lineWidth+1+shift, captionRect.Bottom-2*lineWidth+shift);
@@ -5398,8 +5394,6 @@
 
                                graphics.DrawLine(pen, 
captionRect.Left+2*lineWidth+shift, captionRect.Top+2*lineWidth+shift, 
captionRect.Right-2*lineWidth+shift, captionRect.Bottom-2*lineWidth+shift);
                                graphics.DrawLine(pen, 
captionRect.Right-2*lineWidth+shift, captionRect.Top+2*lineWidth+shift, 
captionRect.Left+2*lineWidth+shift, captionRect.Bottom-2*lineWidth+shift);
-                               pen.StartCap = oldStartCap;
-                               pen.EndCap = oldEndCap;
                                return;
                        }
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to