Fixing styles that get used in the Tree

Learned a few lessons here...
Style objects should only be created OnGui
Textures loaded from colors have a hideflag property too

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

@@ -63,7 +63,7 @@ public override void InitializeView(IView parent)
         public override void OnEnable()
         {
             base.OnEnable();
-            UpdateTreeIconAndStyles();
+            UpdateTreeIcons();
             AttachHandlers(Repository);
             Repository.CheckLocalAndRemoteBranchListChangedEvent(lastLocalAndRemoteBranchListChangedEvent);
         }
@@ -157,7 +157,7 @@ private void BuildTree()
                 treeRemotes = new BranchesTree();
                 treeRemotes.IsRemote = true;
 
-                UpdateTreeIconAndStyles();
+                UpdateTreeIcons();
             }
 
             localBranches.Sort(CompareBranches);
@@ -168,19 +168,30 @@ private void BuildTree()
             Redraw();
         }
 
-        private void UpdateTreeIconAndStyles()
+        private void UpdateTreeIcons()
         {
             if (treeLocals != null)
             {
                 treeLocals.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon);
+            }
+
+            if (treeRemotes != null)
+            {
+                treeRemotes.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon);
+            }
+        }
+
+        private void UpdateTreeStyles()
+        {
+            if (treeLocals != null && treeLocals.FolderStyle == null)
+            {
                 treeLocals.FolderStyle = Styles.Foldout;
                 treeLocals.TreeNodeStyle = Styles.TreeNode;
                 treeLocals.ActiveTreeNodeStyle = Styles.TreeNodeActive;
             }
 
-            if (treeRemotes != null)
+            if (treeRemotes != null && treeRemotes.FolderStyle == null)
             {
-                treeRemotes.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon);
                 treeRemotes.FolderStyle = Styles.Foldout;
                 treeRemotes.TreeNodeStyle = Styles.TreeNode;
                 treeRemotes.ActiveTreeNodeStyle = Styles.TreeNodeActive;
@@ -304,6 +315,8 @@ private void OnTreeGUI(Rect rect)
             var initialRect = rect;
             var treeHadFocus = treeLocals.SelectedNode != null;
 
+            UpdateTreeStyles();
+
             rect = treeLocals.Render(rect, scroll,
                 node =>{ },
                 node => {

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

@@ -20,9 +20,9 @@ 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;