Merge branch 'enhancements/skip-render-hidden-nodes' into enhancements/changes-tree-view-rollup

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs

@@ -43,6 +43,7 @@ public static Texture2D GetTextureFromColor(Color color)
             pix[0] = color;
 
             Texture2D result = new Texture2D(1, 1);
+            result.hideFlags = HideFlags.HideAndDontSave;
             result.SetPixels(pix);
             result.Apply();
 

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

@@ -181,6 +181,23 @@ private void UpdateTreeIcons()
             }
         }
 
+        private void UpdateTreeStyles()
+        {
+            if (treeLocals != null && treeLocals.FolderStyle == null)
+            {
+                treeLocals.FolderStyle = Styles.Foldout;
+                treeLocals.TreeNodeStyle = Styles.TreeNode;
+                treeLocals.ActiveTreeNodeStyle = Styles.TreeNodeActive;
+            }
+
+            if (treeRemotes != null && treeRemotes.FolderStyle == null)
+            {
+                treeRemotes.FolderStyle = Styles.Foldout;
+                treeRemotes.TreeNodeStyle = Styles.TreeNode;
+                treeRemotes.ActiveTreeNodeStyle = Styles.TreeNodeActive;
+            }
+        }
+
         private void OnButtonBarGUI()
         {
             if (mode == BranchesMode.Default)
@@ -295,26 +312,20 @@ private void OnButtonBarGUI()
 
         private void OnTreeGUI(Rect rect)
         {
-             var initialRect = rect;
-
-            if (treeLocals.FolderStyle == null)
-            {
-                treeLocals.FolderStyle = Styles.Foldout;
-                treeLocals.TreeNodeStyle = Styles.TreeNode;
-                treeLocals.ActiveTreeNodeStyle = Styles.TreeNodeActive;
-                treeRemotes.FolderStyle = Styles.Foldout;
-                treeRemotes.TreeNodeStyle = Styles.TreeNode;
-                treeRemotes.ActiveTreeNodeStyle = Styles.TreeNodeActive;
-            }
+            UpdateTreeStyles();
 
+            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.Name);
                 },
                 node => {
@@ -337,7 +348,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)
@@ -347,7 +358,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

@@ -20,16 +20,18 @@ public abstract class Tree
         [SerializeField] public Rect Margin = new Rect();
         [SerializeField] public Rect Padding = new Rect();
 
-        [SerializeField] public GUIStyle FolderStyle;
-        [SerializeField] public GUIStyle TreeNodeStyle;
-        [SerializeField] public GUIStyle ActiveTreeNodeStyle;
+        [NonSerialized] public GUIStyle FolderStyle;
+        [NonSerialized] public GUIStyle TreeNodeStyle;
+        [NonSerialized] public GUIStyle ActiveTreeNodeStyle;
 
         [SerializeField] private List<TreeNode> nodes = new List<TreeNode>();
         [SerializeField] private TreeNode selectedNode = null;
         [SerializeField] private TreeNode activeNode = null;
         [SerializeField] private TreeNodeDictionary folders = new TreeNodeDictionary();
 
         [NonSerialized] private Stack<bool> indents = new Stack<bool>();
+        [NonSerialized] private Action<TreeNode> rightClickNextRender;
+        [NonSerialized] private TreeNode rightClickNextRenderNode;
 
         public bool IsInitialized { get { return nodes != null && nodes.Count > 0 && !String.IsNullOrEmpty(nodes[0].Name); } }
         public bool RequiresRepaint { get; private set; }
@@ -54,6 +56,12 @@ public void Load(IEnumerable<ITreeData> data, string title)
         {
             var collapsedFoldersEnumerable = folders.Where(pair => pair.Value.IsCollapsed).Select(pair => pair.Key);
             var collapsedFolders = new HashSet<string>(collapsedFoldersEnumerable);
+            string selectedNodeName = null;
+            if (SelectedNode != null)
+            {
+                selectedNodeName = SelectedNode.Name;
+                SelectedNode = null;
+            }
 
             folders.Clear();
             nodes.Clear();
@@ -92,6 +100,11 @@ public void Load(IEnumerable<ITreeData> data, string title)
                             IsFolder = isFolder
                         };
 
+                        if (selectedNodeName != null && name == selectedNodeName)
+                        {
+                            SelectedNode = node;
+                        }
+
                         if (node.IsActive)
                         {
                             activeNode = node;
@@ -132,17 +145,32 @@ public void Load(IEnumerable<ITreeData> data, string title)
             }
         }
 
-        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)
         {
-            Profiler.BeginSample("TreeControl");
-            bool visible = true;
-            var availableHeight = rect.y + rect.height;
+            if (Event.current.type != EventType.Repaint)
+            {
+                if (rightClickNextRender != null)
+                {
+                    rightClickNextRender.Invoke(rightClickNextRenderNode);
+                    rightClickNextRender = null;
+                    rightClickNextRenderNode = null;
+                }
+            }
+
+            var startDisplay = scroll.y;
+            var endDisplay = scroll.y + containingRect.height;
 
             RequiresRepaint = false;
             rect = new Rect(0f, rect.y, rect.width, ItemHeight);
 
             var titleNode = nodes[0];
-            bool selectionChanged = titleNode.Render(rect, 0f, selectedNode == titleNode, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
+            var selectionChanged = false;
+
+            var titleDisplay = !(rect.y > endDisplay || rect.yMax < startDisplay);
+            if (titleDisplay)
+            {
+                selectionChanged = titleNode.Render(rect, Styles.TreeIndentation, selectedNode == titleNode, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
+            }
 
             if (selectionChanged)
             {
@@ -164,15 +192,18 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
                     Indent();
                 }
 
-                if (visible)
+                var changed = false;
+
+                var display = !(rect.y > endDisplay || rect.yMax < startDisplay);
+                if (display)
                 {
-                    var changed = node.Render(rect, Styles.TreeIndentation, selectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
+                    changed = node.Render(rect, Styles.TreeIndentation, selectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
+                }
 
-                    if (node.IsFolder && changed)
-                    {
-                        // toggle visibility for all the nodes under this one
-                        ToggleNodeVisibility(i, node);
-                    }
+                if (node.IsFolder && changed)
+                {
+                    // toggle visibility for all the nodes under this one
+                    ToggleNodeVisibility(i, node);
                 }
 
                 if (node.Level < level)
@@ -186,10 +217,7 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
 
                 if (!node.IsHidden)
                 {
-                    if (visible)
-                    {
-                        RequiresRepaint = HandleInput(rect, node, i, singleClick, doubleClick, rightClick);
-                    }
+                    RequiresRepaint = HandleInput(rect, node, i, singleClick, doubleClick, rightClick);
                     rect.y += ItemHeight + ItemSpacing;
                 }
             }
@@ -274,7 +302,8 @@ private bool HandleInput(Rect rect, TreeNode currentNode, int index, Action<Tree
                 }
                 if (mouseButton == 1 && clickCount == 1 && rightClick != null)
                 {
-                    rightClick(currentNode);
+                    rightClickNextRender = rightClick;
+                    rightClickNextRenderNode = currentNode;
                 }
             }