diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2014-12-05 22:07:20 +0300 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2014-12-05 22:07:20 +0300 |
| commit | a1ab4919b0abcd3685ca2e4c241a69301ab52cfe (patch) | |
| tree | df2350b934c87827e3af824ee567d118e3e544b5 /mcs/class/Managed.Windows.Forms | |
| parent | fd556a44fef6fad7693fad94694d050e300b4f3f (diff) | |
| parent | b3214a4a420f4c5515cae3d475a7dadae4d69435 (diff) | |
Merge pull request #1322 from StephenMcConnel/bug23532
Remove excessive shortcut key matching in ToolStrip
Diffstat (limited to 'mcs/class/Managed.Windows.Forms')
| -rw-r--r-- | mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs index 30c0d89f5fb..6cfe4b2ecf8 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolStrip.cs @@ -1145,13 +1145,7 @@ namespace System.Windows.Forms if (tsi.Enabled && tsi.Visible && !string.IsNullOrEmpty (tsi.Text) && Control.IsMnemonic (charCode, tsi.Text)) return tsi.ProcessMnemonic (charCode); - string code = Char.ToUpper (charCode).ToString (); - - // If any item's text starts with our letter, it gets the message - if ((Control.ModifierKeys & Keys.Alt) != 0 || this is ToolStripDropDownMenu) - foreach (ToolStripItem tsi in this.Items) - if (tsi.Enabled && tsi.Visible && !string.IsNullOrEmpty (tsi.Text) && tsi.Text.ToUpper ().StartsWith (code) && !(tsi is ToolStripControlHost)) - return tsi.ProcessMnemonic (charCode); + // Do not try to match any further here. See Xamarin bug 23532. return base.ProcessMnemonic (charCode); } |