Merge pull request #2173 from glopesdev/issue-1967

Allow selecting output menu items using keyboard

Author: glopesdev

Bonsai.Editor/GraphView/WorkflowGraphView.cs

@@ -1196,14 +1196,14 @@ private IDisposable CreateOutputMenuItems(Type type, ToolStripMenuItem ownerItem
 
         private ToolStripMenuItem CreateOutputMenuItem(string memberName, string memberSelector, Type memberType, GraphNode selectedNode)
         {
-            var menuItem = new ToolStripMenuItem(memberName, null, CanEdit ? delegate
+            var menuItem = new ToolStripOutputMenuItem(memberName, null, !CanEdit ? null : delegate
             {
                 var builder = new MemberSelectorBuilder { Selector = memberSelector };
                 var successor = selectedNode.Successors.Select(edge => WorkflowEditor.GetGraphNodeBuilder(edge.Node)).FirstOrDefault();
                 var branch = Control.ModifierKeys.HasFlag(Keys.Alt) || successor != null && successor is MemberSelectorBuilder;
                 Editor.CreateGraphNode(builder, selectedNode, CreateGraphNodeType.Successor, branch);
                 contextMenuStrip.Close(ToolStripDropDownCloseReason.ItemClicked);
-            } : (EventHandler)null);
+            });
 
             InitializeOutputMenuItem(menuItem, memberSelector, memberType);
             return menuItem;
@@ -1651,6 +1651,29 @@ private void contextMenuStrip_Closed(object sender, ToolStripDropDownClosedEvent
 
         #endregion
 
+        #region ToolStripOutputMenuItem Class
+
+        class ToolStripOutputMenuItem : ToolStripMenuItem
+        {
+            public ToolStripOutputMenuItem(string text, Image image, EventHandler onClick)
+                : base(text, image, onClick)
+            {
+            }
+
+            protected override bool ProcessDialogKey(Keys keyData)
+            {
+                if (keyData == Keys.Return)
+                {
+                    OnClick(EventArgs.Empty);
+                    return true;
+                }
+
+                return base.ProcessDialogKey(keyData);
+            }
+        }
+
+        #endregion
+
         #region PropertyInfoComparer Class
 
         class PropertyInfoComparer : IEqualityComparer<PropertyInfo>