Merge branch 'enhancements/history-detail-tree-view' into fixes/global-selection-abuse

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs

@@ -64,6 +64,7 @@ class Styles
                                 headerDescriptionStyle,
                                 historyToolbarButtonStyle,
                                 historyLockStyle,
+                                historyEntrySummaryStyle,
                                 historyEntryDetailsStyle,
                                 historyEntryDetailsRightStyle,
                                 historyFileTreeBoxStyle,
@@ -396,6 +397,20 @@ public static GUIStyle HistoryLockStyle
                 return historyLockStyle;
             }
         }
+        public static GUIStyle HistoryEntrySummaryStyle
+        {
+            get
+            {
+                if (historyEntrySummaryStyle == null)
+                {
+                    historyEntrySummaryStyle = new GUIStyle(Label);
+                    historyEntrySummaryStyle.name = "HistoryEntrySummaryStyle";
+
+                    historyEntrySummaryStyle.contentOffset = new Vector2(BaseSpacing * 2, 0);
+                }
+                return historyEntrySummaryStyle;
+            }
+        }
 
         public static GUIStyle HistoryEntryDetailsStyle
         {
@@ -412,6 +427,8 @@ public static GUIStyle HistoryEntryDetailsStyle
                     historyEntryDetailsStyle.onNormal.textColor = Label.onNormal.textColor;
                     historyEntryDetailsStyle.onFocused.background = Label.onFocused.background;
                     historyEntryDetailsStyle.onFocused.textColor = Label.onFocused.textColor;
+
+                    historyEntryDetailsStyle.contentOffset = new Vector2(BaseSpacing * 2, 0);
                 }
                 return historyEntryDetailsStyle;
             }

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

@@ -39,8 +39,8 @@ class BranchesView : Subview
         [NonSerialized] private int listID = -1;
         [NonSerialized] private BranchesMode targetMode;
 
-        [SerializeField] private BranchesTree treeLocals;
-        [SerializeField] private BranchesTree treeRemotes;
+        [SerializeField] private BranchesTree treeLocals = new BranchesTree { Title = LocalTitle };
+        [SerializeField] private BranchesTree treeRemotes = new BranchesTree { Title = RemoteTitle, IsRemote = true };
         [SerializeField] private BranchesMode mode = BranchesMode.Default;
         [SerializeField] private string newBranchName;
         [SerializeField] private Vector2 scroll;
@@ -155,18 +155,6 @@ private void Render()
 
         private void BuildTree()
         {
-            if (treeLocals == null)
-            {
-                treeLocals = new BranchesTree();
-                treeLocals.Title = LocalTitle;
-
-                treeRemotes = new BranchesTree();
-                treeRemotes.Title = RemoteTitle;
-                treeRemotes.IsRemote = true;
-
-                TreeOnEnable();
-            }
-
             localBranches.Sort(CompareBranches);
             remoteBranches.Sort(CompareBranches);
 

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

@@ -26,15 +26,19 @@ class ChangesView : Subview
         [SerializeField] private string commitBody = "";
         [SerializeField] private string commitMessage = "";
         [SerializeField] private string currentBranch = "[unknown]";
-        [SerializeField] private Vector2 scroll;
-        [SerializeField] private CacheUpdateEvent lastCurrentBranchChangedEvent;
-        [SerializeField] private CacheUpdateEvent lastStatusEntriesChangedEvent;
-        [SerializeField] private CacheUpdateEvent lastLocksChangedEvent;
-        [SerializeField] private ChangesTree treeChanges;
+
+        [SerializeField] private Vector2 treeScroll;
+        [SerializeField] private ChangesTree treeChanges = new ChangesTree { DisplayRootNode = false, IsCheckable = true };
+
         [SerializeField] private HashSet<string> gitLocks;
         [SerializeField] private List<GitStatusEntry> gitStatusEntries;
+
         [SerializeField] private string changedFilesText = NoChangedFilesLabel;
 
+        [SerializeField] private CacheUpdateEvent lastCurrentBranchChangedEvent;
+        [SerializeField] private CacheUpdateEvent lastStatusEntriesChangedEvent;
+        [SerializeField] private CacheUpdateEvent lastLocksChangedEvent;
+
         public override void OnEnable()
         {
             base.OnEnable();
@@ -85,7 +89,7 @@ public override void OnGUI()
             GUILayout.BeginHorizontal();
             GUILayout.BeginVertical(Styles.CommitFileAreaStyle);
             {
-                scroll = GUILayout.BeginScrollView(scroll);
+                treeScroll = GUILayout.BeginScrollView(treeScroll);
                 {
                     OnTreeGUI(new Rect(0f, 0f, Position.width, Position.height - rect.height + Styles.CommitAreaPadding));
                 }
@@ -114,7 +118,7 @@ private void OnTreeGUI(Rect rect)
                 treeChanges.FocusedTreeNodeStyle = Styles.FocusedTreeNode;
                 treeChanges.FocusedActiveTreeNodeStyle = Styles.FocusedActiveTreeNode;
 
-                var treeRenderRect = treeChanges.Render(rect, scroll, 
+                var treeRenderRect = treeChanges.Render(rect, treeScroll, 
                     node => { }, 
                     node => { },
                     node => { });
@@ -208,17 +212,7 @@ private void MaybeUpdateData()
 
         private void BuildTree()
         {
-            if (treeChanges == null)
-            {
-                treeChanges = new ChangesTree();
-                treeChanges.Title = "Changes";
-                treeChanges.DisplayRootNode = false;
-                treeChanges.IsCheckable = true;
-                treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString();
-
-                TreeOnEnable();
-            }
-
+            treeChanges.PathSeparator = Environment.FileSystem.DirectorySeparatorChar.ToString();
             treeChanges.Load(gitStatusEntries.Select(entry => new GitStatusEntryTreeData(entry, gitLocks.Contains(entry.Path))));
             Redraw();
         }