Author: mkestner
Date: 2006-10-31 13:17:47 -0500 (Tue, 31 Oct 2006)
New Revision: 67182

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
Log:

2006-10-31  Mike Kestner  <[EMAIL PROTECTED]>

        * MenuAPI.cs : fix keynav when menu is click activated.


Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-10-31 16:14:07 UTC (rev 67181)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2006-10-31 18:17:47 UTC (rev 67182)
@@ -1,3 +1,7 @@
+2006-10-31  Mike Kestner  <[EMAIL PROTECTED]>
+
+       * MenuAPI.cs : fix keynav when menu is click activated.
+
 2006-10-31  Jonathan Pobst  <[EMAIL PROTECTED]>
 
        * ToolStrip*: Version 0.2.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs       
2006-10-31 16:14:07 UTC (rev 67181)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MenuAPI.cs       
2006-10-31 18:17:47 UTC (rev 67182)
@@ -64,7 +64,7 @@
                KeyNavState keynav_state = KeyNavState.Idle;
 
                public bool Navigating {
-                       get { return keynav_state != KeyNavState.Idle; }
+                       get { return keynav_state != KeyNavState.Idle || 
active; }
                }
 
                internal static Point ScreenToMenu (Menu menu, Point pnt)       
        
@@ -654,9 +654,9 @@
                                return true;
                        } else if ((keyData & Keys.Alt) == Keys.Alt)
                                return ProcessMnemonic (msg, keyData);
-                       else if ((Msg)msg.Msg == Msg.WM_SYSKEYUP || 
keynav_state == KeyNavState.Idle)
+                       else if ((Msg)msg.Msg == Msg.WM_SYSKEYUP)
                                return false;
-                       else if (!active && !Navigating)
+                       else if (!Navigating)
                                return false;
 
                        switch (keyData) {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to