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

        up.

svn path=/trunk/mcs/; revision=60853

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 9900c439572b1b406fa1055ee95b8351b26024da..13ceb667ff16e69f16e3df3e079147f0e4027bca 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,9 +1,21 @@
+2006-05-18  Jackson Harper  <jackson@ximian.com>
+
+       * ThemeWin32Classic.cs: Don't use endcaps, they mess the drawing
+       up.
+
 2006-05-18  Peter Dennis Bartok  <pbartok@novell.com> 
 
        * Control.cs: Brought back our old UpdateZOrder method as a private
          function and switched our calls from UpdateZOrder to the new one.
          This fixes the Paint.Net canvas disappearing bug.
 
+2006-05-18  Jackson Harper  <jackson@ximian.com>
+
+       * 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  <pbartok@novell.com>
 
        * XplatUIX11.cs (DefWndProc): WM_SETCURSOR: Assign the return value 

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
index a8723e90557b357d29dfab50c0f2c714be57c6d9..331f7d45bf4a6dd59ba63719e024fefbb1745d89 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
@@ -5387,10 +5387,6 @@ namespace System.Windows.Forms
                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 @@ namespace System.Windows.Forms
 
                                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;
                        }