Author: jpobst
Date: 2008-01-24 11:31:02 -0500 (Thu, 24 Jan 2008)
New Revision: 93814

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
Log:
2008-01-24  Jonatham Pobst  <[EMAIL PROTECTED]>

        * ThemeWin32Classic.cs: Add tab stops and NoWrap to dropdown MenuItems. 
 Top
        level MenuItems do not respect tabs.
        [Fixes bug #355196]

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2008-01-24 16:29:01 UTC (rev 93813)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2008-01-24 16:31:02 UTC (rev 93814)
@@ -1,3 +1,9 @@
+2008-01-24  Jonatham Pobst  <[EMAIL PROTECTED]>
+
+       * ThemeWin32Classic.cs: Add tab stops and NoWrap to dropdown MenuItems. 
 Top
+       level MenuItems do not respect tabs.
+       [Fixes bug #355196]
+
 2008-01-23  Geoff Norton  <[EMAIL PROTECTED]>
 
        * XplatUICarbon.cs:  Ensure that windows are created in their initial 

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs 
    2008-01-24 16:29:01 UTC (rev 93813)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs 
    2008-01-24 16:31:02 UTC (rev 93814)
@@ -75,6 +75,8 @@
                        string_format_menu_text.LineAlignment = 
StringAlignment.Center;
                        string_format_menu_text.Alignment = 
StringAlignment.Near;
                        string_format_menu_text.HotkeyPrefix = 
HotkeyPrefix.Show;
+                       string_format_menu_text.SetTabStops (0f, new float [] { 
50f });
+                       string_format_menu_text.FormatFlags |= 
StringFormatFlags.NoWrap;
 
                        string_format_menu_shortcut = new StringFormat ();      
                        string_format_menu_shortcut.LineAlignment = 
StringAlignment.Center;
@@ -2958,7 +2960,7 @@
                                return;
                        } else {                
                                SizeF size;
-                               size =  dc.MeasureString (item.Text, MenuFont);
+                               size =  dc.MeasureString (item.Text, MenuFont, 
int.MaxValue, string_format_menu_text);
                                item.Width = (int) size.Width;
                                item.Height = (int) size.Height;
        

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

Reply via email to