Trying to reload the icons

Author: StanleyGoldman

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

@@ -59,6 +59,7 @@ public override void InitializeView(IView parent)
         public override void OnEnable()
         {
             base.OnEnable();
+            UpdateTreeIcons();
             AttachHandlers(Repository);
             Repository.CheckLocalAndRemoteBranchListChangedEvent(lastLocalAndRemoteBranchListChangedEvent);
         }
@@ -134,25 +135,87 @@ private void Render()
 
         private void BuildTree()
         {
+            if (treeLocals == null)
+            {
+                treeLocals = new Tree();
+
+                treeRemotes = new Tree();
+
+                UpdateTreeIcons();
+            }
+
             localBranches.Sort(CompareBranches);
             remoteBranches.Sort(CompareBranches);
-            treeLocals = new Tree();
-            treeLocals.ActiveNodeIcon = Styles.ActiveBranchIcon;
-            treeLocals.NodeIcon = Styles.BranchIcon;
-            treeLocals.RootFolderIcon = Styles.RootFolderIcon;
-            treeLocals.FolderIcon = Styles.FolderIcon;
-
-            treeRemotes = new Tree();
-            treeRemotes.ActiveNodeIcon = Styles.ActiveBranchIcon;
-            treeRemotes.NodeIcon = Styles.BranchIcon;
-            treeRemotes.RootFolderIcon = Styles.RootFolderIcon;
-            treeRemotes.FolderIcon = Styles.FolderIcon;
 
             treeLocals.Load(localBranches.Cast<ITreeData>(), LocalTitle);
             treeRemotes.Load(remoteBranches.Cast<ITreeData>(), RemoteTitle);
             Redraw();
         }
 
+        private void UpdateTreeIcons()
+        {
+            var localsLoaded = false;
+            var remotesLoaded = false;
+
+            if (treeLocals != null)
+            {
+                if (treeLocals.ActiveNodeIcon == null)
+                {
+                    localsLoaded = true;
+                    treeLocals.ActiveNodeIcon = Styles.ActiveBranchIcon;
+                }
+
+                if (treeLocals.NodeIcon == null)
+                {
+                    localsLoaded = true;
+                    treeLocals.NodeIcon = Styles.BranchIcon;
+                }
+
+                if (treeLocals.FolderIcon == null)
+                {
+                    localsLoaded = true;
+                    treeLocals.FolderIcon = Styles.FolderIcon;
+                }
+            }
+
+            if (treeRemotes != null)
+            {
+                if (treeRemotes.ActiveNodeIcon == null)
+                {
+                    remotesLoaded = true;
+                    treeRemotes.ActiveNodeIcon = Styles.ActiveBranchIcon;
+                }
+
+                if (treeRemotes.NodeIcon == null)
+                {
+                    remotesLoaded = true;
+                    treeRemotes.NodeIcon = Styles.BranchIcon;
+                }
+
+                if (treeRemotes.RootFolderIcon == null)
+                {
+                    remotesLoaded = true;
+                    treeRemotes.RootFolderIcon = Styles.RootFolderIcon;
+                }
+
+                if (treeRemotes.FolderIcon == null)
+                {
+                    remotesLoaded = true;
+                    treeRemotes.FolderIcon = Styles.FolderIcon;
+                }
+            }
+
+            if (localsLoaded)
+            {
+                treeLocals.LoadNodeIcons();
+            }
+
+            if (remotesLoaded)
+            {
+                treeRemotes.LoadNodeIcons();
+            }
+        }
+
         private void OnButtonBarGUI()
         {
             if (mode == BranchesMode.Default)

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

@@ -17,10 +17,10 @@ public class Tree
         [SerializeField] public Rect Margin = new Rect();
         [SerializeField] public Rect Padding = new Rect();
 
-        [SerializeField] public Texture2D ActiveNodeIcon;
-        [SerializeField] public Texture2D NodeIcon;
-        [SerializeField] public Texture2D FolderIcon;
-        [SerializeField] public Texture2D RootFolderIcon;
+        [NonSerialized] public Texture2D ActiveNodeIcon;
+        [NonSerialized] public Texture2D NodeIcon;
+        [NonSerialized] public Texture2D FolderIcon;
+        [NonSerialized] public Texture2D RootFolderIcon;
 
         [SerializeField] public GUIStyle FolderStyle;
         [SerializeField] public GUIStyle TreeNodeStyle;
@@ -82,7 +82,7 @@ public void Load(IEnumerable<ITreeData> data, string title)
                 Level = 0,
                 IsFolder = true
             };
-            titleNode.Load();
+            SetNodeIcons(titleNode);
             nodes.Add(titleNode);
 
             foreach (var d in data)
@@ -110,9 +110,7 @@ public void Load(IEnumerable<ITreeData> data, string title)
                             activeNode = node;
                         }
 
-                        ResetNodeIcons(node);
-
-                        node.Load();
+                        SetNodeIcons(node);
 
                         nodes.Add(node);
                         if (isFolder)
@@ -135,7 +133,6 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
             rect = new Rect(0f, rect.y, rect.width, ItemHeight);
 
             var titleNode = nodes[0];
-            ResetNodeIcons(titleNode);
             bool selectionChanged = titleNode.Render(rect, 0f, selectedNode == titleNode, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
 
             if (selectionChanged)
@@ -153,8 +150,6 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
             for (; i < nodes.Count; i++)
             {
                 var node = nodes[i];
-//                ResetNodeIcons(node);
-
                 if (node.Level > level && !node.IsHidden)
                 {
                     Indent();
@@ -368,7 +363,7 @@ private void Unindent()
             indents.Pop();
         }
 
-        private void ResetNodeIcons(TreeNode node)
+        private void SetNodeIcons(TreeNode node)
         {
             if (node.IsActive)
             {
@@ -385,8 +380,17 @@ private void ResetNodeIcons(TreeNode node)
             {
                 node.Icon = NodeIcon;
             }
+
             node.Load();
         }
+
+        public void LoadNodeIcons()
+        {
+            foreach (var treeNode in nodes)
+            {
+                SetNodeIcons(treeNode);
+            }
+        }
     }
 
     [Serializable]
@@ -400,7 +404,7 @@ public class TreeNode
         public bool IsHidden;
         public bool IsActive;
         public GUIContent content;
-        public Texture2D Icon;
+        [NonSerialized] public Texture2D Icon;
 
         public void Load()
         {