diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2018-02-27 13:26:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 13:26:34 +0300 |
| commit | abf24c68b78f6b779366f6e91126a4842ec16276 (patch) | |
| tree | 6e069211904cb93bc9f96b646d3e2b76b63fe95d /main/src | |
| parent | a4f247985f69204ec17537c3f9c8363dab8472a4 (diff) | |
| parent | fa69294571e583e492a2cf3f058ef37047669b8c (diff) | |
Merge pull request #3955 from mono/master-issue3826
Fixes issue #3826 Quick fix context dialog incorrectly handles enter
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs index 30706dedee..34f8345a9c 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components/ContextMenuExtensionsMac.cs @@ -157,7 +157,8 @@ namespace MonoDevelop.Components public NSContextMenuItem (string label, ContextMenuItem item) : base (label) { contextMenu = new WeakReference<ContextMenuItem> (item); - this.Activated += OnActivated; + if (item.SubMenu == null || item.SubMenu.Items.Count == 0) + this.Activated += OnActivated; } static void OnActivated (object sender, EventArgs args) @@ -195,6 +196,7 @@ namespace MonoDevelop.Components public NSLocationAwareMenu (ContextMenu menu, Action closeHandler, NSLocationAwareMenu parent) { WeakDelegate = new ContextMenuDelegate (menu) { CloseHandler = closeHandler }; + Parent = parent != null ? new WeakReference<NSLocationAwareMenu> (parent) : null; } |