2007-07-18 Jonathan Pobst <monkey@jpobst.com>

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

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 606363b5bbd60ccce75f87e87ad456d836d43ac1..ecbafddf51d1f2085e34bdb66f4ce064c83b6c91 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-18  Jonathan Pobst  <monkey@jpobst.com>
+
+       * ToolStrip.cs, ToolStripDropDown.cs, ToolStripDropDownMenu.cs: 
+       Implement MaxItemSize.
+
 2007-07-17  Jonathan Pobst  <monkey@jpobst.com>
 
        * Control.cs: Remove per-control 1x1 Bitmap and Graphics context used

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
index 6364b0294059eb07fd8b88131ebc1cba0937c46b..d1df776947cca0d9c10c38dd06f70d5b1a778265 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
@@ -520,6 +520,9 @@ namespace System.Windows.Forms
                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 @@ namespace System.Windows.Forms
                                                Application.KeyboardCapture = null;
                                        
                                        // Redraw for mnemonic underlines
-                                       this.Refresh ();
+                                       this.Invalidate ();
                                }
                        }
                }

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
index 482d046bd73d888f203cbfd87c0d6e7a0a6034c9..a4e227e62d8d7242c2c9c7e72c901207c37a9d65 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDown.cs
@@ -315,9 +315,9 @@ namespace System.Windows.Forms
                        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; }

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
index 0ccb4e857769cd69dd5444185ca3d826e4209dbf..aff388e17c93e241a1054e4b01143770d022f217 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStripDropDownMenu.cs
@@ -82,6 +82,10 @@ namespace System.Windows.Forms
                protected override Padding DefaultPadding {
                        get { return base.DefaultPadding; }
                }
+
+               protected internal override Size MaxItemSize {
+                       get { return Size; }
+               }
                #endregion
 
                #region Protected Methods