Author: jpobst
Date: 2007-11-09 16:24:04 -0500 (Fri, 09 Nov 2007)
New Revision: 89346
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
Log:
2007-11-09 Jonathan Pobst <[EMAIL PROTECTED]>
* Label.cs: Add StringFormatFlags.LineLimit. This tells DrawString to
not draw partial lines.
* LinkLabel.cs: Change FormatFlags setter from = to |= so that the
LineLimit flag from the base is preserved.
Fixes the windows part of bug #338965.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-11-09 21:06:30 UTC (rev 89345)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-11-09 21:24:04 UTC (rev 89346)
@@ -1,5 +1,13 @@
2007-11-09 Jonathan Pobst <[EMAIL PROTECTED]>
+ * Label.cs: Add StringFormatFlags.LineLimit. This tells DrawString to
+ not draw partial lines.
+ * LinkLabel.cs: Change FormatFlags setter from = to |= so that the
+ LineLimit flag from the base is preserved.
+ Fixes the windows part of bug #338965.
+
+2007-11-09 Jonathan Pobst <[EMAIL PROTECTED]>
+
* TextBoxBase.cs: Move handling of the enter key from KEYDOWN to CHAR
so that it can be canceled in KeyPress.
Fixes bug #340078.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
2007-11-09 21:06:30 UTC (rev 89345)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
2007-11-09 21:24:04 UTC (rev 89346)
@@ -139,6 +139,7 @@
autosize = false;
TabStop = false;
string_format = new StringFormat();
+ string_format.FormatFlags = StringFormatFlags.LineLimit;
TextAlign = ContentAlignment.TopLeft;
image = null;
UseMnemonic = true;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
2007-11-09 21:06:30 UTC (rev 89345)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
2007-11-09 21:24:04 UTC (rev 89346)
@@ -107,7 +107,7 @@
pieces = null;
focused_index = -1;
- string_format.FormatFlags = StringFormatFlags.NoClip;
+ string_format.FormatFlags |= StringFormatFlags.NoClip;
ActiveLinkColor = Color.Red;
DisabledLinkColor = ThemeEngine.Current.ColorGrayText;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
