Adding functionality to alternate the icon for remote branch trees

Author: StanleyGoldman

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

@@ -141,7 +141,9 @@ private void BuildTree()
             if (treeLocals == null)
             {
                 treeLocals = new BranchesTree();
+
                 treeRemotes = new BranchesTree();
+                treeRemotes.IsRemote = true;
 
                 UpdateTreeIcons();
             }
@@ -167,10 +169,10 @@ private void UpdateTreeIcons()
                     treeLocals.ActiveNodeIcon = Styles.ActiveBranchIcon;
                 }
 
-                if (treeLocals.NodeIcon == null)
+                if (treeLocals.BranchIcon == null)
                 {
                     localsLoaded = true;
-                    treeLocals.NodeIcon = Styles.BranchIcon;
+                    treeLocals.BranchIcon = Styles.BranchIcon;
                 }
 
                 if (treeLocals.FolderIcon == null)
@@ -188,16 +190,16 @@ private void UpdateTreeIcons()
                     treeRemotes.ActiveNodeIcon = Styles.ActiveBranchIcon;
                 }
 
-                if (treeRemotes.NodeIcon == null)
+                if (treeRemotes.BranchIcon == null)
                 {
                     remotesLoaded = true;
-                    treeRemotes.NodeIcon = Styles.BranchIcon;
+                    treeRemotes.BranchIcon = Styles.BranchIcon;
                 }
 
-                if (treeRemotes.RootFolderIcon == null)
+                if (treeRemotes.RemoteIcon == null)
                 {
                     remotesLoaded = true;
-                    treeRemotes.RootFolderIcon = Styles.RootFolderIcon;
+                    treeRemotes.RemoteIcon = Styles.RootFolderIcon;
                 }
 
                 if (treeRemotes.FolderIcon == null)

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

@@ -12,9 +12,11 @@ namespace GitHub.Unity
     public class BranchesTree: Tree
     {
         [NonSerialized] public Texture2D ActiveNodeIcon;
-        [NonSerialized] public Texture2D NodeIcon;
+        [NonSerialized] public Texture2D BranchIcon;
         [NonSerialized] public Texture2D FolderIcon;
-        [NonSerialized] public Texture2D RootFolderIcon;
+        [NonSerialized] public Texture2D RemoteIcon;
+
+        [SerializeField] public bool IsRemote;
 
         protected override Texture2D GetNodeIcon(TreeNode node)
         {
@@ -25,14 +27,13 @@ protected override Texture2D GetNodeIcon(TreeNode node)
             }
             else if (node.IsFolder)
             {
-                if (node.Level == 1)
-                    nodeIcon = RootFolderIcon;
-                else
-                    nodeIcon = FolderIcon;
+                nodeIcon = IsRemote && node.Level == 1
+                    ? RemoteIcon
+                    : FolderIcon;
             }
             else
             {
-                nodeIcon = NodeIcon;
+                nodeIcon = BranchIcon;
             }
             return nodeIcon;
         }