2007-08-01 Jonathan Pobst <monkey@jpobst.com>

	* TextRenderer.cs: Remove the LineLimit string format flag from the
	DrawString fallback method so that things like buttons that aren't
	tall enough to draw a full line will still draw part of the text.
	[Fixes part of bug #82272]

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 3deb8933d5d31ebd01cf24f975881b39d9d29ad6..ac765680fc835cf4d1ef981822e4609cf36dfdbe 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,10 @@
+2007-08-01  Jonathan Pobst  <monkey@jpobst.com>
+
+       * TextRenderer.cs: Remove the LineLimit string format flag from the
+       DrawString fallback method so that things like buttons that aren't
+       tall enough to draw a full line will still draw part of the text.
+       [Fixes part of bug #82272]
+
 2007-08-01  Rolf Bjarne Kvinge <RKvinge@novell.com> 
 
        * DataGridView.cs: Implemented AutoResizeColumn(s).

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
index 0136a8aaabaaf7567930b3eb659b5a68c94002ce..112e0f0302288a6a866521977593f475447c86e5 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TextRenderer.cs
@@ -494,9 +494,6 @@ namespace System.Windows.Forms
                        if ((flags & TextFormatFlags.NoClipping) == TextFormatFlags.NoClipping)
                                sf.FormatFlags |= StringFormatFlags.NoClip;
 
-                       if ((flags & TextFormatFlags.WordBreak) == 0)
-                               sf.FormatFlags |= StringFormatFlags.LineLimit;
-
                        return sf;
                }
 #if NET_2_0