Merge commit '03d85a800838f06e03cbb4a4150bb5980516408f' into fixes/branches-view-globe-icon

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

Author: StanleyGoldman

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

@@ -158,65 +158,14 @@ private void BuildTree()
 
         private void UpdateTreeIcons()
         {
-            var localsLoaded = false;
-            var remotesLoaded = false;
-
             if (treeLocals != null)
             {
-                if (treeLocals.ActiveNodeIcon == null)
-                {
-                    localsLoaded = true;
-                    treeLocals.ActiveNodeIcon = Styles.ActiveBranchIcon;
-                }
-
-                if (treeLocals.BranchIcon == null)
-                {
-                    localsLoaded = true;
-                    treeLocals.BranchIcon = Styles.BranchIcon;
-                }
-
-                if (treeLocals.FolderIcon == null)
-                {
-                    localsLoaded = true;
-                    treeLocals.FolderIcon = Styles.FolderIcon;
-                }
+                treeLocals.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.RootFolderIcon);
             }
 
             if (treeRemotes != null)
             {
-                if (treeRemotes.ActiveNodeIcon == null)
-                {
-                    remotesLoaded = true;
-                    treeRemotes.ActiveNodeIcon = Styles.ActiveBranchIcon;
-                }
-
-                if (treeRemotes.BranchIcon == null)
-                {
-                    remotesLoaded = true;
-                    treeRemotes.BranchIcon = Styles.BranchIcon;
-                }
-
-                if (treeRemotes.RemoteIcon == null)
-                {
-                    remotesLoaded = true;
-                    treeRemotes.RemoteIcon = Styles.RootFolderIcon;
-                }
-
-                if (treeRemotes.FolderIcon == null)
-                {
-                    remotesLoaded = true;
-                    treeRemotes.FolderIcon = Styles.FolderIcon;
-                }
-            }
-
-            if (localsLoaded)
-            {
-                treeLocals.LoadNodeIcons();
-            }
-
-            if (remotesLoaded)
-            {
-                treeRemotes.LoadNodeIcons();
+                treeRemotes.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.RootFolderIcon);
             }
         }
 

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

@@ -8,37 +8,6 @@
 
 namespace GitHub.Unity
 {
-    [Serializable]
-    public class BranchesTree: Tree
-    {
-        [NonSerialized] public Texture2D ActiveNodeIcon;
-        [NonSerialized] public Texture2D BranchIcon;
-        [NonSerialized] public Texture2D FolderIcon;
-        [NonSerialized] public Texture2D RemoteIcon;
-
-        [SerializeField] public bool IsRemote;
-
-        protected override Texture2D GetNodeIcon(TreeNode node)
-        {
-            Texture2D nodeIcon;
-            if (node.IsActive)
-            {
-                nodeIcon = ActiveNodeIcon;
-            }
-            else if (node.IsFolder)
-            {
-                nodeIcon = IsRemote && node.Level == 1
-                    ? RemoteIcon
-                    : FolderIcon;
-            }
-            else
-            {
-                nodeIcon = BranchIcon;
-            }
-            return nodeIcon;
-        }
-    }
-
     [Serializable]
     public abstract class Tree
     {
@@ -403,7 +372,7 @@ private void SetNodeIcon(TreeNode node)
 
         protected abstract Texture2D GetNodeIcon(TreeNode node);
 
-        public void LoadNodeIcons()
+        protected void LoadNodeIcons()
         {
             foreach (var treeNode in nodes)
             {
@@ -480,4 +449,70 @@ public override string ToString()
                 Name, Label, Level, IsFolder, IsCollapsed, IsHidden, IsActive);
         }
     }
+
+    [Serializable]
+    public class BranchesTree: Tree
+    {
+        [SerializeField] public bool IsRemote;
+        
+        [NonSerialized] public Texture2D ActiveNodeIcon;
+        [NonSerialized] public Texture2D BranchIcon;
+        [NonSerialized] public Texture2D FolderIcon;
+        [NonSerialized] public Texture2D RemoteIcon;
+
+        protected override Texture2D GetNodeIcon(TreeNode node)
+        {
+            Texture2D nodeIcon;
+            if (node.IsActive)
+            {
+                nodeIcon = ActiveNodeIcon;
+            }
+            else if (node.IsFolder)
+            {
+                nodeIcon = IsRemote && node.Level == 1
+                    ? RemoteIcon
+                    : FolderIcon;
+            }
+            else
+            {
+                nodeIcon = BranchIcon;
+            }
+            return nodeIcon;
+        }
+
+
+        public void UpdateIcons(Texture2D activeBranchIcon, Texture2D branchIcon, Texture2D folderIcon, Texture2D rootFolderIcon)
+        {
+            var localsLoaded = false;
+
+            if (ActiveNodeIcon == null)
+            {
+                localsLoaded = true;
+                ActiveNodeIcon = activeBranchIcon;
+            }
+
+            if (BranchIcon == null)
+            {
+                localsLoaded = true;
+                BranchIcon = branchIcon;
+            }
+
+            if (FolderIcon == null)
+            {
+                localsLoaded = true;
+                FolderIcon = folderIcon;
+            }
+
+            if (RemoteIcon == null)
+            {
+                localsLoaded = true;
+                RemoteIcon = rootFolderIcon;
+            }
+
+            if (localsLoaded)
+            {
+                LoadNodeIcons();
+            }
+        }
+    }
 }