Author: jpobst
Date: 2008-02-07 17:52:33 -0500 (Thu, 07 Feb 2008)
New Revision: 95202
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiWindowManager.cs
Log:
2008-02-07 Jonathan Pobst <[EMAIL PROTECTED]>
* MdiWindowManager.cs: If we are maximized and using MainMenuStrip
for our menus, display that control box menu instead of the 1.1
menu one.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-07 22:30:37 UTC (rev 95201)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-02-07 22:52:33 UTC (rev 95202)
@@ -1,5 +1,11 @@
2008-02-07 Jonathan Pobst <[EMAIL PROTECTED]>
+ * MdiWindowManager.cs: If we are maximized and using MainMenuStrip
+ for our menus, display that control box menu instead of the 1.1
+ menu one.
+
+2008-02-07 Jonathan Pobst <[EMAIL PROTECTED]>
+
* MdiControlStrip.cs: Add property to access the mdi form tied to
each toolstripitem.
* MdiClient.cs: Be smarter about removing and adding toolstripitems
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiWindowManager.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiWindowManager.cs
2008-02-07 22:30:37 UTC (rev 95201)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MdiWindowManager.cs
2008-02-07 22:52:33 UTC (rev 95202)
@@ -272,6 +272,19 @@
internal void ShowPopup (Point pnt)
{
+#if NET_2_0
+ // If we are using MainMenuStrip, display that menu
instead
+ if (form.WindowState == FormWindowState.Maximized &&
form.MdiParent.MainMenuStrip != null)
+ if (form.MdiParent.MainMenuStrip.Items.Count >
0) {
+ ToolStripItem tsi =
form.MdiParent.MainMenuStrip.Items[0];
+
+ if (tsi is
MdiControlStrip.SystemMenuItem) {
+ (tsi as
MdiControlStrip.SystemMenuItem).ShowDropDown ();
+ return;
+ }
+ }
+#endif
+
icon_popup_menu.MenuItems[0].Enabled =
form.window_state != FormWindowState.Normal; // restore
icon_popup_menu.MenuItems[1].Enabled =
form.window_state != FormWindowState.Maximized; // move
icon_popup_menu.MenuItems[2].Enabled =
form.window_state != FormWindowState.Maximized; // size
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
