Author: jpobst
Date: 2007-04-03 12:52:51 -0400 (Tue, 03 Apr 2007)
New Revision: 75348
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
Log:
2007-04-03 Jonathan Pobst <[EMAIL PROTECTED]>
* ToolBar.cs: Fix some breakage caused by the SetBoundsCore change.
(ToolBar was relying on SetBoundsCore to default the values sent
base off of BoundsSpecified.)
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-04-03 16:20:27 UTC (rev 75347)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-04-03 16:52:51 UTC (rev 75348)
@@ -1,3 +1,9 @@
+2007-04-03 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * ToolBar.cs: Fix some breakage caused by the SetBoundsCore change.
+ (ToolBar was relying on SetBoundsCore to default the values sent
+ base off of BoundsSpecified.)
+
2007-04-03 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
* DateTimePicker.cs: Change Text so that when a null value or empty
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2007-04-03 16:20:27 UTC (rev 75347)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolBar.cs
2007-04-03 16:52:51 UTC (rev 75348)
@@ -992,9 +992,11 @@
calculated_size += Vertical ? x : y;
if (Vertical)
- Width = AutoSize ? calculated_size :
requested_size;
+ if (requested_size >= 0)
+ SetBounds (Bounds.X, Bounds.Y, AutoSize
? calculated_size : requested_size, Width, BoundsSpecified.None);
else
- Height = AutoSize ? calculated_size :
requested_size;
+ if (requested_size >= 0)
+ SetBounds (Bounds.X, Bounds.Y, Height,
AutoSize ? calculated_size : requested_size, BoundsSpecified.None);
return changed;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches