Allow navigating to selected node by keyboard

bonsai-rx · Sep 17, 2024 · 245b3be · 245b3be
1 parent c8658a6
commit 245b3be
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/Bonsai.Editor/EditorForm.Designer.cs b/Bonsai.Editor/EditorForm.Designer.cs
diff --git a/Bonsai.Editor/EditorForm.cs b/Bonsai.Editor/EditorForm.cs
@@ -1872,7 +1872,7 @@ void FindNextMatch(Func<ExpressionBuilder, bool> predicate, ExpressionBuilder cu
             }
         }
 
-        private void explorerTreeView_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e)
+        private void explorerTreeView_Navigate(object sender, TreeViewEventArgs e)
         {
             var workflowPath = (WorkflowEditorPath)e.Node?.Tag;
             editorControl.WorkflowGraphView.WorkflowPath = workflowPath;

diff --git a/Bonsai.Editor/ExplorerTreeView.cs b/Bonsai.Editor/ExplorerTreeView.cs
@@ -14,6 +14,7 @@ class ExplorerTreeView : ToolboxTreeView
         bool activeDoubleClick;
         readonly ImageList imageList;
         readonly ImageList stateImageList;
+        static readonly object EventNavigate = new();
 
         public ExplorerTreeView()
         {
@@ -52,6 +53,40 @@ static Bitmap ResizeMakeBorder(Bitmap original, Size newSize)
             ImageList = imageList;
         }
 
+        public event TreeViewEventHandler Navigate
+        {
+            add { Events.AddHandler(EventNavigate, value); }
+            remove { Events.RemoveHandler(EventNavigate, value); }
+        }
+
+        protected virtual void OnNavigate(TreeViewEventArgs e)
+        {
+            if (Events[EventNavigate] is TreeViewEventHandler handler)
+            {
+                handler(this, e);
+            }
+        }
+
+        protected override void OnNodeMouseDoubleClick(TreeNodeMouseClickEventArgs e)
+        {
+            if (e.Node is not null && HitTest(e.Location).Location != TreeViewHitTestLocations.PlusMinus)
+            {
+                OnNavigate(new TreeViewEventArgs(e.Node, TreeViewAction.ByMouse));
+            }
+
+            base.OnNodeMouseDoubleClick(e);
+        }
+
+        protected override void OnKeyDown(KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Return && SelectedNode != null)
+            {
+                OnNavigate(new TreeViewEventArgs(SelectedNode, TreeViewAction.ByKeyboard));
+            }
+
+            base.OnKeyDown(e);
+        }
+
         protected override void OnBeforeCollapse(TreeViewCancelEventArgs e)
         {
             if (activeDoubleClick && e.Action == TreeViewAction.Collapse)