Merge branch 'enhancements/history-detail-tree-view-rollup' into enhancements/history-list-view

Author: StanleyGoldman

src/GitHub.Api/UI/TreeBase.cs

@@ -36,7 +36,7 @@ public void Load(IEnumerable<TData> treeDatas)
 
             var displayRootLevel = DisplayRootNode ? 1 : 0;
 
-            var isSelected = selectedNodePath != null && Title == selectedNodePath;
+            var isSelected = IsSelectable && selectedNodePath != null && Title == selectedNodePath;
             AddNode(Title, Title, -1 + displayRootLevel, true, false, false, false, isSelected, null);
 
             var hideChildren = false;
@@ -318,6 +318,7 @@ private void ToggleParentFoldersChecked(int idx, TNode node, bool isChecked)
         protected abstract List<TNode> Nodes { get; }
         public abstract string Title { get; set; }
         public abstract bool DisplayRootNode { get; set; }
+        public abstract bool IsSelectable { get; set; }
         public abstract bool IsCheckable { get; set; }
         public abstract string PathSeparator { get; set; }
     }

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

@@ -38,6 +38,7 @@ public class ChangesTree : Tree<ChangesTreeNode, GitStatusEntryTreeData>
         [SerializeField] public string title = string.Empty;
         [SerializeField] public string pathSeparator = "/";
         [SerializeField] public bool displayRootNode = true;
+        [SerializeField] public bool isSelectable = true;
         [SerializeField] public bool isCheckable = false;
         [SerializeField] private List<ChangesTreeNode> nodes = new List<ChangesTreeNode>();
         [SerializeField] private ChangesTreeNode selectedNode = null;
@@ -60,6 +61,12 @@ public override bool IsCheckable
             set { isCheckable = value; }
         }
 
+        public override bool IsSelectable
+        {
+            get { return isSelectable; }
+            set { isSelectable = value; }
+        }
+
         public override string PathSeparator
         {
             get { return pathSeparator; }

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

@@ -157,7 +157,7 @@ public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TNode>
         public void Focus()
         {
             bool selectionChanged = false;
-            if (Event.current.type == EventType.KeyDown)
+            if (IsSelectable && Event.current.type == EventType.KeyDown)
             {
                 int directionY = Event.current.keyCode == KeyCode.UpArrow ? -1 : Event.current.keyCode == KeyCode.DownArrow ? 1 : 0;
                 int directionX = Event.current.keyCode == KeyCode.LeftArrow ? -1 : Event.current.keyCode == KeyCode.RightArrow ? 1 : 0;
@@ -191,7 +191,11 @@ private bool HandleInput(Rect rect, TNode currentNode, int index, Action<TNode>
                 Event.current.Use();
                 GUIUtility.keyboardControl = controlId;
 
-                SelectedNode = currentNode;
+                if (IsSelectable)
+                {
+                    SelectedNode = currentNode;
+                }
+
                 requiresRepaint = true;
                 var clickCount = Event.current.clickCount;
                 var mouseButton = Event.current.button;
@@ -212,7 +216,7 @@ private bool HandleInput(Rect rect, TNode currentNode, int index, Action<TNode>
             }
 
             // Keyboard navigation if this child is the current selection
-            if (GUIUtility.keyboardControl == controlId && currentNode == SelectedNode && Event.current.type == EventType.KeyDown)
+            if (IsSelectable && GUIUtility.keyboardControl == controlId && currentNode == SelectedNode && Event.current.type == EventType.KeyDown)
             {
                 int directionY = Event.current.keyCode == KeyCode.UpArrow ? -1 : Event.current.keyCode == KeyCode.DownArrow ? 1 : 0;
                 int directionX = Event.current.keyCode == KeyCode.LeftArrow ? -1 : Event.current.keyCode == KeyCode.RightArrow ? 1 : 0;
@@ -529,6 +533,7 @@ public class BranchesTree : Tree<TreeNode, GitBranchTreeData>
         [SerializeField] public string title = string.Empty;
         [SerializeField] public string pathSeparator = "/";
         [SerializeField] public bool displayRootNode = true;
+        [SerializeField] public bool isSelectable = true;
         [SerializeField] public bool isCheckable = false;
         [SerializeField] private List<TreeNode> nodes = new List<TreeNode>();
         [SerializeField] private TreeNode selectedNode = null;
@@ -551,6 +556,12 @@ public override bool IsCheckable
             set { isCheckable = value; }
         }
 
+        public override bool IsSelectable
+        {
+            get { return isSelectable; }
+            set { isSelectable = value; }
+        }
+
         public override string PathSeparator
         {
             get { return pathSeparator; }