Author: jpobst
Date: 2007-09-18 11:04:36 -0400 (Tue, 18 Sep 2007)
New Revision: 85973
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
Log:
2007-09-18 Jonathan Pobst <[EMAIL PROTECTED]>
* ToolStrip.cs: Set AutoSizeMode back to GrowAndShrink to refix
bug #325406, but set a minimum for StatusStrip to 22 to keep
bug #325390 fixed. I think this minimum would have been figured
up automatically if the grip was actually a ToolStripItem, but it
currently is not.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-09-18 14:42:31 UTC (rev 85972)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-09-18 15:04:36 UTC (rev 85973)
@@ -1,3 +1,11 @@
+2007-09-18 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * ToolStrip.cs: Set AutoSizeMode back to GrowAndShrink to refix
+ bug #325406, but set a minimum for StatusStrip to 22 to keep
+ bug #325390 fixed. I think this minimum would have been figured
+ up automatically if the grip was actually a ToolStripItem, but it
+ currently is not.
+
2007-09-18 Carlos Alberto Cortez <[EMAIL PROTECTED]>
* ListView.cs: max_label_wrapping is now 30 pixels instead of 38,
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
2007-09-18 14:42:31 UTC (rev 85972)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs
2007-09-18 15:04:36 UTC (rev 85973)
@@ -98,6 +98,7 @@
this.items = new ToolStripItemCollection (this, items,
true);
this.allow_merge = true;
base.AutoSize = true;
+ this.SetAutoSizeMode (AutoSizeMode.GrowAndShrink);
this.back_color = Control.DefaultBackColor;
this.can_overflow = true;
base.CausesValidation = false;
@@ -1431,6 +1432,9 @@
if (new_size.Height == 0)
new_size.Height = ExplicitBounds.Height;
+ if (this is StatusStrip)
+ new_size.Height = Math.Max
(new_size.Height, 22);
+
return new_size;
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
