Author: everaldo
Date: 2006-11-06 13:11:52 -0500 (Mon, 06 Nov 2006)
New Revision: 67411
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
Log:
Deactivate menu on mouse up when menus it is already activated
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-06 16:45:44 UTC (rev 67410)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2006-11-06 18:11:52 UTC (rev 67411)
@@ -1,3 +1,8 @@
+2006-11-05 Everaldo Canuto <[EMAIL PROTECTED]>
+
+ * MenuAPI.cs: Deactivate menu on mouse up when menus it is already
+ activated. Fixes #79369, #79832.
+
2006-11-05 Alexander Olk <[EMAIL PROTECTED]>
* FileDialog.cs: *sigh* Because of recent runtime changes (r67043) I
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
2006-11-06 16:45:44 UTC (rev 67410)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
2006-11-06 18:11:52 UTC (rev 67411)
@@ -37,6 +37,7 @@
internal class MenuTracker {
internal bool active;
+ internal bool popdown_menu;
public Menu CurrentMenu;
public Menu TopMenu;
Form grab_control;
@@ -140,7 +141,8 @@
if (item != null && !item.Enabled)
return;
-
+ popdown_menu = active;
+
SelectItem (item.Parent, item, item.IsPopup);
if (item.IsPopup) {
active = true;
@@ -177,7 +179,7 @@
else {
/* releasing the mouse button on a
* popup item leaves things active */
- if (item.IsPopup)
+ if (item.IsPopup && !popdown_menu)
return;
/* otherwise we hide the menu and
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches