Merge remote-tracking branch 'remotes/origin/fixes/tree-style-reloading' into enhancements/branches-view-rollup

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

@@ -181,6 +181,23 @@ private void UpdateTreeIcons()
             }
         }
 
+        private void UpdateTreeStyles()
+        {
+            if (treeLocals != null && treeLocals.FolderStyle == null)
+            {
+                treeLocals.FolderStyle = Styles.Foldout;
+                treeLocals.TreeNodeStyle = Styles.TreeNode;
+                treeLocals.ActiveTreeNodeStyle = Styles.TreeNodeActive;
+            }
+
+            if (treeRemotes != null && treeRemotes.FolderStyle == null)
+            {
+                treeRemotes.FolderStyle = Styles.Foldout;
+                treeRemotes.TreeNodeStyle = Styles.TreeNode;
+                treeRemotes.ActiveTreeNodeStyle = Styles.TreeNodeActive;
+            }
+        }
+
         private void OnButtonBarGUI()
         {
             if (mode == BranchesMode.Default)
@@ -295,18 +312,9 @@ private void OnButtonBarGUI()
 
         private void OnTreeGUI(Rect rect)
         {
-             var initialRect = rect;
-
-            if (treeLocals.FolderStyle == null)
-            {
-                treeLocals.FolderStyle = Styles.Foldout;
-                treeLocals.TreeNodeStyle = Styles.TreeNode;
-                treeLocals.ActiveTreeNodeStyle = Styles.TreeNodeActive;
-                treeRemotes.FolderStyle = Styles.Foldout;
-                treeRemotes.TreeNodeStyle = Styles.TreeNode;
-                treeRemotes.ActiveTreeNodeStyle = Styles.TreeNodeActive;
-            }
+            UpdateTreeStyles();
 
+            var initialRect = rect;
             var treeHadFocus = treeLocals.SelectedNode != null;
 
             rect = treeLocals.Render(rect, scroll,

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;