Author: jpobst
Date: 2007-07-18 15:31:35 -0400 (Wed, 18 Jul 2007)
New Revision: 82232

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
Log:
2007-07-18  Jonathan Pobst  <[EMAIL PROTECTED]>

        * ToolStrip.cs, ToolStripDropDown.cs, ToolStripDropDownMenu.cs: 
        Implement MaxItemSize.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-07-18 19:27:08 UTC (rev 82231)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-07-18 19:31:35 UTC (rev 82232)
@@ -1,3 +1,8 @@
+2007-07-18  Jonathan Pobst  <[EMAIL PROTECTED]>
+
+       * ToolStrip.cs, ToolStripDropDown.cs, ToolStripDropDownMenu.cs: 
+       Implement MaxItemSize.
+
 2007-07-17  Jonathan Pobst  <[EMAIL PROTECTED]>
 
        * Control.cs: Remove per-control 1x1 Bitmap and Graphics context used

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs     
2007-07-18 19:27:08 UTC (rev 82231)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs     
2007-07-18 19:31:35 UTC (rev 82232)
@@ -520,6 +520,9 @@
                protected virtual bool DefaultShowItemToolTips { get { return 
true; } }
                protected override Size DefaultSize { get { return new Size 
(100, 25); } }
                protected internal virtual ToolStripItemCollection 
DisplayedItems { get { return this.displayed_items; } }
+               protected internal virtual Size MaxItemSize {
+                       get { return new Size (Width - (GripStyle == 
ToolStripGripStyle.Hidden ? 1 : 8), Height); }
+               }
                #endregion
 
                #region Public Methods
@@ -1242,7 +1245,7 @@
                                                Application.KeyboardCapture = 
null;
                                        
                                        // Redraw for mnemonic underlines
-                                       this.Refresh ();
+                                       this.Invalidate ();
                                }
                        }
                }

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs 
    2007-07-18 19:27:08 UTC (rev 82231)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs 
    2007-07-18 19:31:35 UTC (rev 82232)
@@ -315,9 +315,9 @@
                        get { return true; }
                }
 
-               //protected internal override Size MaxItemSize {
-               //        get {  return new Size 
(Screen.PrimaryScreen.Bounds.Width - 2, Screen.PrimaryScreen.Bounds.Height - 
34); }
-               //}
+               protected internal override Size MaxItemSize {
+                       get { return new Size 
(Screen.PrimaryScreen.Bounds.Width - 2, Screen.PrimaryScreen.Bounds.Height - 
34); }
+               }
 
                protected virtual bool TopMost {
                        get { return true; }

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
 2007-07-18 19:27:08 UTC (rev 82231)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
 2007-07-18 19:31:35 UTC (rev 82232)
@@ -82,6 +82,10 @@
                protected override Padding DefaultPadding {
                        get { return base.DefaultPadding; }
                }
+
+               protected internal override Size MaxItemSize {
+                       get { return Size; }
+               }
                #endregion
 
                #region Protected Methods

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

Reply via email to