diff --git a/src/GitHub.Api/Git/GitBranch.cs b/src/GitHub.Api/Git/GitBranch.cs index 41cd21106..3e1c747d8 100644 --- a/src/GitHub.Api/Git/GitBranch.cs +++ b/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}"; diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs index fd19672c3..db718a8fa 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs +++ b/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; } diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs index 924c3ea48..1a61735c8 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs @@ -437,7 +437,9 @@ public bool Render(Rect rect, float indentation, bool isSelected, GUIStyle folde { 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);