Author: jpobst
Date: 2007-04-30 12:11:26 -0400 (Mon, 30 Apr 2007)
New Revision: 76503
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
Log:
2007-04-30 Jonathan Pobst <[EMAIL PROTECTED]>
* TextRenderer.cs: Use the flags argument when using the MeasureString
fallback algorithm.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-04-30 15:43:52 UTC (rev 76502)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-04-30 16:11:26 UTC (rev 76503)
@@ -1,5 +1,10 @@
2007-04-30 Jonathan Pobst <[EMAIL PROTECTED]>
+ * TextRenderer.cs: Use the flags argument when using the MeasureString
+ fallback algorithm.
+
+2007-04-30 Jonathan Pobst <[EMAIL PROTECTED]>
+
* MenuStrip.cs: Don't let multiple ToolStripSeparators get added to
the MDI menu item. [Fixes bug #81483]
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
2007-04-30 15:43:52 UTC (rev 76502)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
2007-04-30 16:11:26 UTC (rev 76503)
@@ -266,8 +266,9 @@
else {
#endif
Graphics g = Graphics.FromImage
(measure_bitmap);
+ StringFormat sf = FlagsToStringFormat (flags);
- Size retval = g.MeasureString (text,
font).ToSize ();
+ Size retval = g.MeasureString (text, font,
Int32.MaxValue, sf).ToSize ();
if (retval.Width > 0 && (flags &
TextFormatFlags.NoPadding) == 0)
retval.Width += 9;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
