Prevent right click from triggering ToolStrip.OnItemClicked
authorStephen McConnel <stephen_mcconnel@sil.org>
Wed, 25 Feb 2015 23:00:30 +0000 (17:00 -0600)
committerStephen McConnel <stephen_mcconnel@sil.org>
Wed, 25 Feb 2015 23:00:30 +0000 (17:00 -0600)
This addresses https://bugzilla.xamarin.com/show_bug.cgi?id=26887
(along with a previous fix).

mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs

index 6cfe4b2ecf896bf96db3ad83bf96b18291ead7de..0c505ead94ad1c5aad4fc0a093081c4b6363bbf2 100644 (file)
@@ -962,8 +962,9 @@ namespace System.Windows.Forms
                {
                        // If we're currently over an item (set in MouseMove)
                        if (mouse_currently_over != null && !(mouse_currently_over is ToolStripControlHost) && mouse_currently_over.Enabled) {
-                               // Fire our ItemClicked event
-                               OnItemClicked (new ToolStripItemClickedEventArgs (mouse_currently_over));
+                               // Fire our ItemClicked event, but only for a left mouse click.
+                               if (mea.Button == MouseButtons.Left)
+                                       OnItemClicked (new ToolStripItemClickedEventArgs (mouse_currently_over));
                                        
                                // Fire the item's MouseUp event
                                if (mouse_currently_over != null)