Merge branch 'enhancements/skip-render-hidden-nodes' into enhancements/tree-improvements

# Conflicts:
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs
#	src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

Author: StanleyGoldman

src/GitHub.Api/UI/TreeLoader.cs

@@ -6,26 +6,29 @@ namespace GitHub.Unity
 {
     public interface ITree
     {
-        void AddNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed);
+        void AddNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isSelected);
         void Clear();
         HashSet<string> GetCollapsedFolders();
         string Title { get; }
         bool DisplayRootNode { get; }
         bool IsCheckable { get; }
         string PathSeparator { get; }
+        string SelectedNodeName { get; }
     }
 
     public static class TreeLoader
     {
         public static void Load(ITree tree, IEnumerable<ITreeData> treeDatas)
         {
             var collapsedFolders = tree.GetCollapsedFolders();
-
+            var selectedNodeName = tree.SelectedNodeName;
+            
             tree.Clear();
 
             var displayRootLevel = tree.DisplayRootNode ? 1 : 0;
 
-            tree.AddNode(path: tree.Title, label: tree.Title, level: -1 + displayRootLevel, isFolder: true, isActive: false, isHidden: false, isCollapsed: false);
+            var isSelected = selectedNodeName != null && tree.Title == selectedNodeName;
+            tree.AddNode(path: tree.Title, label: tree.Title, level: -1 + displayRootLevel, isFolder: true, isActive: false, isHidden: false, isCollapsed: false, isSelected: isSelected);
 
             var hideChildren = false;
             var hideChildrenBelowLevel = 0;
@@ -72,14 +75,13 @@ public static void Load(ITree tree, IEnumerable<ITreeData> treeDatas)
                                     hideChildrenBelowLevel = level;
                                 }
                             }
-
                         }
 
-                        tree.AddNode(path: nodePath, label: label, level: i + displayRootLevel, isFolder: isFolder, isActive: treeData.IsActive, isHidden: nodeIsHidden, isCollapsed: nodeIsCollapsed);
+                        isSelected = selectedNodeName != null && nodePath == selectedNodeName;
+                        tree.AddNode(path: nodePath, label: label, level: i + displayRootLevel, isFolder: isFolder, isActive: treeData.IsActive, isHidden: nodeIsHidden, isCollapsed: nodeIsCollapsed, isSelected: isSelected);
                     }
                 }
             }
         }
-
     }
 }

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

@@ -319,12 +319,15 @@ private void OnTreeGUI(Rect rect)
             var initialRect = rect;
             var treeHadFocus = treeLocals.SelectedNode != null;
 
-            rect = treeLocals.Render(rect, scroll,
+            rect = treeLocals.Render(initialRect, rect, scroll,
                 node =>{ },
                 node => {
                     if (node.IsFolder)
                         return;
 
+                    if(node.IsActive)
+                        return;
+
                     SwitchBranch(node.Path);
                 },
                 node => {
@@ -347,7 +350,7 @@ private void OnTreeGUI(Rect rect)
 
             rect.y += Styles.TreePadding;
 
-            rect = treeRemotes.Render(rect, scroll,
+            rect = treeRemotes.Render(initialRect, rect, scroll,
                 node => { },
                 node => {
                     if (node.IsFolder)
@@ -357,7 +360,7 @@ private void OnTreeGUI(Rect rect)
                 },
                 node => {
                     if (node.IsFolder)
-                       return;
+                        return;
 
                     var menu = CreateContextMenuForRemoteBranchNode(node);
                     menu.ShowAsContext();

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

@@ -55,6 +55,11 @@ private set
             }
         }
 
+        public string SelectedNodeName
+        {
+            get { return SelectedNode != null ? SelectedNode.Path : null; }
+        }
+
         public string Title
         {
             get { return title; }
@@ -79,7 +84,7 @@ public string PathSeparator
             set { pathSeparator = value; }
         }
 
-        public void AddNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed)
+        public void AddNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, bool isSelected)
         {
             var node = new TreeNode
             {
@@ -101,6 +106,11 @@ public void AddNode(string path, string label, int level, bool isFolder, bool is
                 activeNode = node;
             }
 
+            if (isSelected)
+            {
+                SelectedNode = node;
+            }
+
             if (isFolder)
             {
                 folders.Add(node.Path, node);
@@ -111,6 +121,7 @@ public void Clear()
         {
             folders.Clear();
             nodes.Clear();
+            SelectedNode = null;
         }
 
         public HashSet<string> GetCollapsedFolders()
@@ -119,7 +130,7 @@ public HashSet<string> GetCollapsedFolders()
             return new HashSet<string>(collapsedFoldersEnumerable);
         }
 
-        public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null, Action<TreeNode> rightClick = null)
+        public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TreeNode> singleClick = null, Action<TreeNode> doubleClick = null, Action<TreeNode> rightClick = null)
         {
             if (Event.current.type != EventType.Repaint)
             {
@@ -131,6 +142,9 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
                 }
             }
 
+            var startDisplay = scroll.y;
+            var endDisplay = scroll.y + containingRect.height;
+
             RequiresRepaint = false;
             rect = new Rect(0f, rect.y, rect.width, ItemHeight);
 
@@ -139,7 +153,13 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
             if (DisplayRootNode)
             {
                 var titleNode = nodes[0];
-                var renderResult = titleNode.Render(rect, Styles.TreeIndentation, selectedNode == titleNode, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
+                var renderResult = TreeNodeRenderResult.None;
+
+                var titleDisplay = !(rect.y > endDisplay || rect.yMax < startDisplay);
+                if (titleDisplay)
+                {
+                    renderResult = titleNode.Render(rect, Styles.TreeIndentation, selectedNode == titleNode, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
+                }
 
                 if (renderResult == TreeNodeRenderResult.VisibilityChange)
                 {
@@ -165,7 +185,14 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
                 {
                     Indent();
                 }
-                var renderResult = node.Render(rect, Styles.TreeIndentation, selectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
+
+                var renderResult = TreeNodeRenderResult.None;
+
+                var display = !(rect.y > endDisplay || rect.yMax < startDisplay);
+                if (display)
+                {
+                    renderResult = node.Render(rect, Styles.TreeIndentation, selectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
+                }
 
                 if (renderResult == TreeNodeRenderResult.VisibilityChange)
                 {