Author: everaldo
Date: 2007-01-01 21:49:11 -0500 (Mon, 01 Jan 2007)
New Revision: 70331

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
Log:
2006-12-31  Everaldo Canuto  <[EMAIL PROTECTED]>

        * ThemeWin32Classic.cs: Uses CPDrawBorder3D to draw menu borders
        instead of line, it simplify draw operation and fix it using 3D
        borders to mimic Win32.



Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-02 02:02:29 UTC (rev 70330)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-01-02 02:49:11 UTC (rev 70331)
@@ -1,3 +1,9 @@
+2006-12-31  Everaldo Canuto  <[EMAIL PROTECTED]>
+
+       * ThemeWin32Classic.cs: Uses CPDrawBorder3D to draw menu borders
+       instead of line, it simplify draw operation and fix it using 3D
+       borders to mimic Win32.
+
 2007-01-01  Jonathan Pobst  <[EMAIL PROTECTED]>
 
        * StatusStrip.cs: Add implementation of the sizing grip.

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs 
    2007-01-02 02:02:29 UTC (rev 70330)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs 
    2007-01-02 02:49:11 UTC (rev 70331)
@@ -2374,38 +2374,19 @@
                        
                public override void DrawPopupMenu (Graphics dc, Menu menu, 
Rectangle cliparea, Rectangle rect)
                {
-
+                       // Fill rectangle area
                        dc.FillRectangle (SystemBrushes.Menu, cliparea);
                        
-                       Pen pen_cht = SystemPens.HighlightText;
-                       Pen pen_ccd = SystemPens.ControlDark;
-                       Pen pen_ccdd = SystemPens.ControlDarkDark;
-
-                       /* Draw menu borders */
-                       dc.DrawLine (pen_cht,
-                               rect.X, rect.Y, rect.X + rect.Width, rect.Y);
-
-                       dc.DrawLine (pen_cht,
-                               rect.X, rect.Y, rect.X, rect.Y + rect.Height);
-
-                       dc.DrawLine (pen_ccd,
-                               rect.X + rect.Width - 1 , rect.Y , rect.X + 
rect.Width - 1, rect.Y + rect.Height);
-
-                       dc.DrawLine (pen_ccdd,
-                               rect.X + rect.Width, rect.Y , rect.X + 
rect.Width, rect.Y + rect.Height);
-
-                       dc.DrawLine (pen_ccd,
-                               rect.X , rect.Y + rect.Height - 1 , rect.X + 
rect.Width - 1, rect.Y + rect.Height -1);
-
-                       dc.DrawLine (pen_ccdd,
-                               rect.X , rect.Y + rect.Height, rect.X + 
rect.Width - 1, rect.Y + rect.Height);
-
-                       for (int i = 0; i < menu.MenuItems.Count; i++)
+                       // Draw menu borders
+                       CPDrawBorder3D (dc, rect, Border3DStyle.Raised, 
all_sides);
+                       
+                       // Draw menu items
+                       for (int i = 0; i < menu.MenuItems.Count; i++) {
                                if (cliparea.IntersectsWith (menu.MenuItems 
[i].bounds)) {
                                        MenuItem item = menu.MenuItems [i];
                                        item.MenuHeight = menu.Height;
-                                       item.PerformDrawItem (new 
DrawItemEventArgs (dc, MenuFont,
-                                               item.bounds, i, item.Status));
+                                       item.PerformDrawItem (new 
DrawItemEventArgs (dc, MenuFont, item.bounds, i, item.Status));
+                               }
                        }
                }
                

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

Reply via email to