Author: pbartok
Date: 2005-08-23 12:19:24 -0400 (Tue, 23 Aug 2005)
New Revision: 48742
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
Log:
2005-08-23 Peter Dennis Bartok <[EMAIL PROTECTED]>
* Label.cs: Now properly recalculates width and height on Font and Text
changes if AutoSize is set
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-08-23 15:50:39 UTC (rev 48741)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-08-23 16:19:24 UTC (rev 48742)
@@ -1,4 +1,9 @@
-2005-08-19:2 Rafael Teixeira <[EMAIL PROTECTED]>
+2005-08-23 Peter Dennis Bartok <[EMAIL PROTECTED]>
+
+ * Label.cs: Now properly recalculates width and height on Font and Text
+ changes if AutoSize is set
+
+2005-08-19 Rafael Teixeira <[EMAIL PROTECTED]>
* TreeView.cs : Revamped drawing logic, and support for FullRowSelect
2005-08-19 Jordi Mas i Hernandez <[EMAIL PROTECTED]>
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
2005-08-23 15:50:39 UTC (rev 48741)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Label.cs
2005-08-23 16:19:24 UTC (rev 48742)
@@ -487,7 +487,11 @@
protected override void OnFontChanged (EventArgs e)
{
base.OnFontChanged (e);
- CalcPreferredHeight ();
+ if (autosize) {
+ CalcAutoSize();
+ } else {
+ CalcPreferredHeight ();
+ }
Refresh ();
}
@@ -512,8 +516,11 @@
protected override void OnTextChanged (EventArgs e)
{
base.OnTextChanged (e);
- CalcPreferredWidth ();
- CalcAutoSize ();
+ if (autosize) {
+ CalcAutoSize ();
+ } else {
+ CalcPreferredWidth ();
+ }
Refresh ();
}
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
