Merge branch 'enhancements/branches-view-rollup' into fixes/branches-view-folder-clickable-area

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

Author: StanleyGoldman

src/GitHub.Api/Git/GitBranch.cs

@@ -17,10 +17,6 @@ public struct GitBranch : ITreeData
         public string tracking;
         public bool isActive;
 
-        public string Name { get { return name; } }
-        public string Tracking { get { return tracking; } }
-        public bool IsActive { get { return isActive; } }
-
         public GitBranch(string name, string tracking, bool active)
         {
             Guard.ArgumentNotNullOrWhiteSpace(name, "name");
@@ -30,6 +26,10 @@ public GitBranch(string name, string tracking, bool active)
             this.isActive = active;
         }
 
+        public string Name => name;
+        public string Tracking => tracking;
+        public bool IsActive => isActive;
+
         public override string ToString()
         {
             return $"{Name} Tracking? {Tracking} Active? {IsActive}";

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

@@ -358,13 +358,9 @@ private void OnTreeGUI(Rect rect)
                 });
 
             if (treeHadFocus && treeRemotes.SelectedNode == null)
-            {
                 treeLocals.Focus();
-            }
             else if (!treeHadFocus && treeRemotes.SelectedNode != null)
-            {
                 treeLocals.Blur();
-            }
 
             if (treeRemotes.RequiresRepaint)
                 Redraw();
@@ -375,16 +371,6 @@ private void OnTreeGUI(Rect rect)
 
         private int CompareBranches(GitBranch a, GitBranch b)
         {
-            //if (IsFavorite(a.Name))
-            //{
-            //    return -1;
-            //}
-
-            //if (IsFavorite(b.Name))
-            //{
-            //    return 1;
-            //}
-
             if (a.Name.Equals("master"))
             {
                 return -1;
@@ -398,31 +384,6 @@ private int CompareBranches(GitBranch a, GitBranch b)
             return a.Name.CompareTo(b.Name);
         }
 
-        //private bool IsFavorite(string branchName)
-        //{
-        //    return !String.IsNullOrEmpty(branchName) && favoritesList.Contains(branchName);
-        //}
-
-        //private void SetFavorite(TreeNode branch, bool favorite)
-        //{
-        //    if (string.IsNullOrEmpty(branch.Name))
-        //    {
-        //        return;
-        //    }
-
-        //    if (!favorite)
-        //    {
-        //        favorites.Remove(branch);
-        //        Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());
-        //    }
-        //    else
-        //    {
-        //        favorites.Remove(branch);
-        //        favorites.Add(branch);
-        //        Manager.LocalSettings.Set(FavoritesSetting, favorites.Select(x => x.Name).ToList());
-        //    }
-        //}
-
         public override bool IsBusy
         {
             get { return false; }

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)
                     {
@@ -210,20 +210,18 @@ public void Focus()
             {
                 int directionY = Event.current.keyCode == KeyCode.UpArrow ? -1 : Event.current.keyCode == KeyCode.DownArrow ? 1 : 0;
                 int directionX = Event.current.keyCode == KeyCode.LeftArrow ? -1 : Event.current.keyCode == KeyCode.RightArrow ? 1 : 0;
-                if (directionY != 0 || directionX != 0)
+
+                if (directionY < 0 || directionX < 0)
                 {
-                    if (directionY < 0 || directionY < 0)
-                    {
-                        SelectedNode = nodes[nodes.Count - 1];
-                        selectionChanged = true;
-                        Event.current.Use();
-                    }
-                    else if (directionY > 0 || directionX > 0)
-                    {
-                        SelectedNode = nodes[0];
-                        selectionChanged = true;
-                        Event.current.Use();
-                    }
+                    SelectedNode = nodes[nodes.Count - 1];
+                    selectionChanged = true;
+                    Event.current.Use();
+                }
+                else if (directionY > 0 || directionX > 0)
+                {
+                    SelectedNode = nodes[0];
+                    selectionChanged = true;
+                    Event.current.Use();
                 }
             }
             RequiresRepaint = selectionChanged;
@@ -437,9 +435,11 @@ 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);
+                }
                 else
                 {
                     style.Draw(nodeRect, content, false, false, false, isSelected);
@@ -451,7 +451,7 @@ public bool Render(Rect rect, float indentation, bool isSelected, GUIStyle folde
                 var toggleRect = new Rect(nodeRect.x, nodeRect.y, style.border.horizontal, nodeRect.height);
 
                 EditorGUI.BeginChangeCheck();
-                GUI.Toggle(toggleRect, !IsCollapsed, "", GUIStyle.none);
+                GUI.Toggle(toggleRect, !IsCollapsed, GUIContent.none, GUIStyle.none);
                 changed = EditorGUI.EndChangeCheck();
             }