Author: jpobst
Date: 2008-01-23 14:47:46 -0500 (Wed, 23 Jan 2008)
New Revision: 93697
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
Log:
2008-01-23 Jonathan Pobst <[EMAIL PROTECTED]>
* Form.cs: Don't set AutoScaleMode in AutoScale if we don't have to.
[Fixes bug #355703]
2008-01-23 Jonathan Pobst <[EMAIL PROTECTED]>
* FormTest.cs: Add test for bug 355703.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-23 19:43:45 UTC (rev 93696)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-23 19:47:46 UTC (rev 93697)
@@ -1,3 +1,8 @@
+2008-01-23 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * Form.cs: Don't set AutoScaleMode in AutoScale if we don't have to.
+ [Fixes bug #355703]
+
2008-01-23 Geoff Norton <[EMAIL PROTECTED]>
* XplatUICarbon.cs: Remove some dead code that was causing warnings.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-01-23 19:43:45 UTC (rev 93696)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-01-23 19:47:46 UTC (rev 93697)
@@ -516,7 +516,7 @@
autoscale = value;
#if NET_2_0
- if (value)
+ if (value && AutoScaleMode !=
AutoScaleMode.None)
AutoScaleMode = AutoScaleMode.None;
#endif
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2008-01-23 19:43:45 UTC (rev 93696)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/ChangeLog
2008-01-23 19:47:46 UTC (rev 93697)
@@ -1,5 +1,9 @@
2008-01-23 Jonathan Pobst <[EMAIL PROTECTED]>
+ * FormTest.cs: Add test for bug 355703.
+
+2008-01-23 Jonathan Pobst <[EMAIL PROTECTED]>
+
* TableLayoutTest.cs: Set ClientSize to a known size to
make Bug355408 () WM independent.
Modified:
trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
2008-01-23 19:43:45 UTC (rev 93696)
+++ trunk/mcs/class/Managed.Windows.Forms/Test/System.Windows.Forms/FormTest.cs
2008-01-23 19:47:46 UTC (rev 93697)
@@ -2806,6 +2806,21 @@
return AutoScaleFactor;
}
}
+
+ [Test] // Bug #355703
+ public void AutoScaleSticks ()
+ {
+ Form f = new Form ();
+
+ f.AutoScale = false;
+ Assert.AreEqual (false, f.AutoScale, "A1");
+
+ f.AutoScale = true;
+ Assert.AreEqual (true, f.AutoScale, "A2");
+
+ f.AutoScaleMode = AutoScaleMode.None;
+ Assert.AreEqual (false, f.AutoScale, "A3");
+ }
#endif
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
