Changes made after rebase

Author: StanleyGoldman

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

@@ -28,7 +28,7 @@ class ChangesView : Subview
         [SerializeField] private Vector2 scroll;
         [SerializeField] private CacheUpdateEvent lastCurrentBranchChangedEvent;
         [SerializeField] private CacheUpdateEvent lastStatusChangedEvent;
-        [SerializeField] private Tree treeChanges;
+        [SerializeField] private ChangesTree treeChanges;
         [SerializeField] private List<GitStatusEntry> gitStatusEntries;
 
         public override void OnEnable()
@@ -186,7 +186,7 @@ private void BuildTree()
         {
             if (treeChanges == null)
             {
-                treeChanges = new Tree();
+                treeChanges = new ChangesTree();
                 treeChanges.DisplayRootNode = false;
                 treeChanges.Checkable = true;
                 treeChanges.PathIgnoreRoot = Environment.RepositoryPath + Environment.FileSystem.DirectorySeparatorChar;
@@ -201,26 +201,9 @@ private void BuildTree()
 
         private void UpdateTreeIcons()
         {
-            var loaded = false;
-
             if (treeChanges != null)
             {
-                if (treeChanges.NodeIcon == null)
-                {
-                    loaded = true;
-                    treeChanges.NodeIcon = Styles.BranchIcon;
-                }
-
-                if (treeChanges.FolderIcon == null)
-                {
-                    loaded = true;
-                    treeChanges.FolderIcon = Styles.FolderIcon;
-                }
-            }
-
-            if (loaded)
-            {
-                treeChanges.LoadNodeIcons();
+                treeChanges.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon);
             }
         }
 

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

@@ -561,14 +561,19 @@ public override string ToString()
     }
 
     [Serializable]
-    public class BranchesTree: Tree
+    public class BranchesTree : Tree
     {
-        [SerializeField] public bool IsRemote;
-        
-        [NonSerialized] public Texture2D ActiveBranchIcon;
-        [NonSerialized] public Texture2D BranchIcon;
-        [NonSerialized] public Texture2D FolderIcon;
-        [NonSerialized] public Texture2D GlobeIcon;
+        [SerializeField]
+        public bool IsRemote;
+
+        [NonSerialized]
+        public Texture2D ActiveBranchIcon;
+        [NonSerialized]
+        public Texture2D BranchIcon;
+        [NonSerialized]
+        public Texture2D FolderIcon;
+        [NonSerialized]
+        public Texture2D GlobeIcon;
 
         protected override Texture2D GetNodeIcon(TreeNode node)
         {
@@ -605,7 +610,57 @@ public void UpdateIcons(Texture2D activeBranchIcon, Texture2D branchIcon, Textur
             }
         }
     }
-    
+    [Serializable]
+    public class ChangesTree : Tree
+    {
+        [SerializeField]
+        public bool IsRemote;
+
+        [NonSerialized]
+        public Texture2D ActiveBranchIcon;
+        [NonSerialized]
+        public Texture2D BranchIcon;
+        [NonSerialized]
+        public Texture2D FolderIcon;
+        [NonSerialized]
+        public Texture2D GlobeIcon;
+
+        protected override Texture2D GetNodeIcon(TreeNode node)
+        {
+            Texture2D nodeIcon;
+            if (node.IsActive)
+            {
+                nodeIcon = ActiveBranchIcon;
+            }
+            else if (node.IsFolder)
+            {
+                nodeIcon = IsRemote && node.Level == 1
+                    ? GlobeIcon
+                    : FolderIcon;
+            }
+            else
+            {
+                nodeIcon = BranchIcon;
+            }
+            return nodeIcon;
+        }
+
+
+        public void UpdateIcons(Texture2D activeBranchIcon, Texture2D branchIcon, Texture2D folderIcon, Texture2D globeIcon)
+        {
+            var needsLoad = ActiveBranchIcon == null || BranchIcon == null || FolderIcon == null || GlobeIcon == null;
+            if (needsLoad)
+            {
+                ActiveBranchIcon = activeBranchIcon;
+                BranchIcon = branchIcon;
+                FolderIcon = folderIcon;
+                GlobeIcon = globeIcon;
+
+                LoadNodeIcons();
+            }
+        }
+    }
+
     public enum TreeNodeRenderResult
     {
         None,