Adding a right click handler to Tree.Render(...)

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs

@@ -282,7 +282,9 @@ private void OnTreeGUI(Rect rect)
 
             var treeHadFocus = treeLocals.SelectedNode != null;
 
-            rect = treeLocals.Render(rect, scroll, _ => { }, node =>
+            rect = treeLocals.Render(rect, scroll,
+                node =>{ },
+                node =>
                 {
                     if (EditorUtility.DisplayDialog(ConfirmSwitchTitle, String.Format(ConfirmSwitchMessage, node.Name), ConfirmSwitchOK,
                             ConfirmSwitchCancel))
@@ -302,6 +304,10 @@ private void OnTreeGUI(Rect rect)
                                 }
                             }).Start();
                     }
+                },
+                node =>
+                {
+                    Debug.Log("Right Click");
                 });
 
             if (treeHadFocus && treeLocals.SelectedNode == null)
@@ -316,7 +322,9 @@ private void OnTreeGUI(Rect rect)
 
             rect.y += Styles.TreePadding;
 
-            rect = treeRemotes.Render(rect, scroll, _ => {}, selectedNode =>
+            rect = treeRemotes.Render(rect, scroll,
+                node => { },
+                selectedNode =>
                 {
                     var indexOfFirstSlash = selectedNode.Name.IndexOf('/');
                     var originName = selectedNode.Name.Substring(0, indexOfFirstSlash);
@@ -355,6 +363,10 @@ private void OnTreeGUI(Rect rect)
                                 .Start();
                         }
                     }
+                },
+                node =>
+                {
+                    Debug.Log("Right Click");
                 });
 
             if (treeHadFocus && treeRemotes.SelectedNode == null)

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

@@ -132,7 +132,7 @@ public void Load(IEnumerable<ITreeData> data, string title)
             foldersKeys = Folders.Keys.Cast<string>().ToList();
         }
 
-        public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null)
+        public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null, Action<TreeNode> rightClick = null)
         {
             Profiler.BeginSample("TreeControl");
             bool visible = true;
@@ -191,7 +191,7 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
                 {
                     if (visible)
                     {
-                        RequiresRepaint = HandleInput(rect, node, i, singleClick, doubleClick);
+                        RequiresRepaint = HandleInput(rect, node, i, singleClick, doubleClick, rightClick);
                     }
                     rect.y += ItemHeight + ItemSpacing;
                 }
@@ -257,7 +257,7 @@ private int ToggleNodeVisibility(int idx, TreeNode rootNode)
             return idx;
         }
 
-        private bool HandleInput(Rect rect, TreeNode currentNode, int index, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null)
+        private bool HandleInput(Rect rect, TreeNode currentNode, int index, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null, Action<TreeNode> rightClick = null)
         {
             bool selectionChanged = false;
             var clickRect = new Rect(0f, rect.y, rect.width, rect.height);
@@ -267,14 +267,20 @@ private bool HandleInput(Rect rect, TreeNode currentNode, int index, Action<Tree
                 SelectedNode = currentNode;
                 selectionChanged = true;
                 var clickCount = Event.current.clickCount;
-                if (clickCount == 1 && singleClick != null)
+                var mouseButton = Event.current.button;
+
+                if (mouseButton == 0 && clickCount == 1 && singleClick != null)
                 {
                     singleClick(currentNode);
                 }
-                if (clickCount > 1 && doubleClick != null)
+                if (mouseButton == 0 && clickCount > 1 && doubleClick != null)
                 {
                     doubleClick(currentNode);
                 }
+                if (mouseButton == 1 && clickCount == 1 && rightClick != null)
+                {
+                    rightClick(currentNode);
+                }
             }
 
             // Keyboard navigation if this child is the current selection