Author: jpobst
Date: 2008-02-07 13:54:31 -0500 (Thu, 07 Feb 2008)
New Revision: 95178
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
Log:
2008-02-07 Jonathan Pobst <[EMAIL PROTECTED]>
* Form.cs: Don't do the previous change when WindowState = Normal,
or it messes up where the window is placed. Fixes test failure.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-07 18:34:31 UTC (rev 95177)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-07 18:54:31 UTC (rev 95178)
@@ -1,5 +1,10 @@
2008-02-07 Jonathan Pobst <[EMAIL PROTECTED]>
+ * Form.cs: Don't do the previous change when WindowState = Normal,
+ or it messes up where the window is placed. Fixes test failure.
+
+2008-02-07 Jonathan Pobst <[EMAIL PROTECTED]>
+
* Form.cs: When becoming visible, if we are an MDI child, call
SetWindowState with a dummy old_state so that changes will actually
be made.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-02-07 18:34:31 UTC (rev 95177)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2008-02-07 18:54:31 UTC (rev 95178)
@@ -2160,9 +2160,12 @@
if (Visible) {
if (window_manager != null)
- // We don't really have an old_state,
and if we pass the same thing,
- // it may not really change the state
for us
- window_manager.SetWindowState
((FormWindowState)(-1), WindowState);
+ if (WindowState ==
FormWindowState.Normal)
+ window_manager.SetWindowState
(WindowState, WindowState);
+ else
+ // We don't really have an
old_state, and if we pass the same thing,
+ // it may not really change the
state for us
+ window_manager.SetWindowState
((FormWindowState)(-1), WindowState);
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
