Merge branch 'branches-view' into fixes/branches-view-cleanup

Author: StanleyGoldman

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

@@ -11,9 +11,9 @@ namespace GitHub.Unity
     [Serializable]
     public class Tree
     {
-        [SerializeField] public float ItemHeight = EditorGUIUtility.singleLineHeight;
-        [SerializeField] public float ItemSpacing = EditorGUIUtility.standardVerticalSpacing;
-        [SerializeField] public float Indentation = 12f;
+        public static float ItemHeight { get { return EditorGUIUtility.singleLineHeight; } }
+        public static float ItemSpacing { get { return EditorGUIUtility.standardVerticalSpacing; } }
+
         [SerializeField] public Rect Margin = new Rect();
         [SerializeField] public Rect Padding = new Rect();
 
@@ -169,7 +169,7 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
 
                 if (visible)
                 {
-                    var changed = node.Render(rect, Indentation, selectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
+                    var changed = node.Render(rect, Styles.TreeIndentation, selectedNode == node, FolderStyle, TreeNodeStyle, ActiveTreeNodeStyle);
 
                     if (node.IsFolder && changed)
                     {
@@ -437,7 +437,7 @@ public bool Render(Rect rect, float indentation, bool isSelected, GUIStyle folde
 
             if (Event.current.type == EventType.repaint)
             {
-                nodeStyle.Draw(fillRect, "", false, false, false, isSelected);
+                nodeStyle.Draw(fillRect, GUIContent.none, false, false, false, isSelected);
                 if (IsFolder)
                 {
                     style.Draw(nodeRect, content, false, false, !IsCollapsed, isSelected);
@@ -451,7 +451,7 @@ public bool Render(Rect rect, float indentation, bool isSelected, GUIStyle folde
             if (IsFolder)
             {
                 EditorGUI.BeginChangeCheck();
-                GUI.Toggle(nodeRect, !IsCollapsed, "", GUIStyle.none);
+                GUI.Toggle(nodeRect, !IsCollapsed, GUIContent.none, GUIStyle.none);
                 changed = EditorGUI.EndChangeCheck();
             }