Merge branch 'enhancements/history-detail-tree-view-rollup' into enhancements/history-list-view

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

Author: StanleyGoldman

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

@@ -304,7 +304,7 @@ private void OnButtonBarGUI()
 
         private void OnTreeGUI(Rect rect)
         {
-            var initialRect = rect;
+            var treeRenderRect = Rect.zero;
             if (treeLocals != null && treeRemotes != null)
             {
                 treeLocals.FolderStyle = Styles.Foldout;
@@ -321,7 +321,7 @@ private void OnTreeGUI(Rect rect)
 
                 var treeHadFocus = treeLocals.SelectedNode != null;
 
-                rect = treeLocals.Render(initialRect, rect, scroll,
+                treeRenderRect = treeLocals.Render(rect, scroll,
                     node => { },
                     node => {
                         if (node.IsFolder)
@@ -350,10 +350,11 @@ private void OnTreeGUI(Rect rect)
 
                 treeHadFocus = treeRemotes.SelectedNode != null;
 
-                rect.y += Styles.TreePadding;
+                treeRenderRect.y += Styles.TreePadding;
 
-                rect = treeRemotes.Render(initialRect, rect, scroll,
-                    node => { },
+                var treeRemoteDisplayRect = new Rect(rect.x, treeRenderRect.y, rect.width, rect.height);
+                treeRenderRect = treeRemotes.Render(treeRemoteDisplayRect, scroll, 
+                    node => { }, 
                     node => {
                         if (node.IsFolder)
                             return;
@@ -377,7 +378,7 @@ private void OnTreeGUI(Rect rect)
                     Redraw();
             }
 
-            GUILayout.Space(rect.y - initialRect.y);
+            GUILayout.Space(treeRenderRect.y - rect.y);
         }
 
         private GenericMenu CreateContextMenuForLocalBranchNode(TreeNode node)

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

@@ -106,7 +106,6 @@ public override void OnSelectionChange()
 
         private void OnTreeGUI(Rect rect)
         {
-            var initialRect = rect;
             if (treeChanges != null)
             {
                 treeChanges.FolderStyle = Styles.Foldout;
@@ -115,18 +114,16 @@ private void OnTreeGUI(Rect rect)
                 treeChanges.FocusedTreeNodeStyle = Styles.FocusedTreeNode;
                 treeChanges.FocusedActiveTreeNodeStyle = Styles.FocusedActiveTreeNode;
 
-                rect = treeChanges.Render(initialRect, rect, treeScroll,
+                var treeRenderRect = treeChanges.Render(rect, treeScroll, 
+                    node => { }, 
                     node => { },
-                    node => {
-                    },
-                    node => {
-                    });
+                    node => { });
 
                 if (treeChanges.RequiresRepaint)
                     Redraw();
-            }
 
-            GUILayout.Space(rect.y - initialRect.y);
+                GUILayout.Space(treeRenderRect.y - rect.y);
+            }
         }
 
         private void RepositoryOnStatusEntriesChanged(CacheUpdateEvent cacheUpdateEvent)

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

@@ -35,7 +35,7 @@ public abstract class Tree<TNode, TData>: TreeBase<TNode, TData>
         public bool IsInitialized { get { return Nodes != null && Nodes.Count > 0 && !String.IsNullOrEmpty(Nodes[0].Path); } }
         public bool RequiresRepaint { get; private set; }
 
-        public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TNode> singleClick = null, Action<TNode> doubleClick = null, Action<TNode> rightClick = null)
+        public Rect Render(Rect treeDisplayRect, Vector2 scroll, Action<TNode> singleClick = null, Action<TNode> doubleClick = null, Action<TNode> rightClick = null)
         {
             if (Selection.activeObject != selectionObject)
             {
@@ -46,7 +46,7 @@ public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TNode>
             var treeHasFocus = GUIUtility.keyboardControl == controlId;
 
             if (!Nodes.Any())
-                return new Rect(0f, rect.y, 0f, 0f);
+                return new Rect(treeDisplayRect.x, treeDisplayRect.y, 0f, 0f);
 
             var treeNodeStyle = TreeNodeStyle;
             var activeTreeNodeStyle = ActiveTreeNodeStyle;
@@ -68,10 +68,10 @@ public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TNode>
             }
 
             var startDisplay = scroll.y;
-            var endDisplay = scroll.y + containingRect.height;
+            var endDisplay = scroll.y + treeDisplayRect.height;
 
             RequiresRepaint = false;
-            rect = new Rect(0f, rect.y, rect.width, ItemHeight);
+            var rect = new Rect(treeDisplayRect.x, treeDisplayRect.y, treeDisplayRect.width, ItemHeight);
 
             var level = 0;
 
@@ -137,6 +137,7 @@ public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TNode>
                         Unindent();
                     }
                 }
+
                 level = node.Level;
 
                 if (!node.IsHidden)