Correcting the scroll and setting the padding on the tree view

Author: StanleyGoldman

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

@@ -483,8 +483,10 @@ public override void OnGUI()
 
                     rect = GUILayoutUtility.GetLastRect();
                     GUILayout.BeginHorizontal(Styles.HistoryFileTreeBoxStyle);
+                    GUILayout.BeginVertical();
                     {
-                        var treeControlRect = new Rect(rect.x, rect.y, Position.width, Position.height - rect.height + Styles.CommitAreaPadding);
+                        var borderLeft = Styles.Label.margin.left;
+                        var treeControlRect = new Rect(rect.x + borderLeft, rect.y, Position.width - borderLeft * 2, Position.height - rect.height + Styles.CommitAreaPadding);
                         var treeRect = Rect.zero;
                         if (treeChanges != null)
                         {
@@ -507,6 +509,7 @@ public override void OnGUI()
 
                         GUILayout.Space(treeRect.y - treeControlRect.y);
                     }
+                    GUILayout.EndVertical();
                     GUILayout.EndHorizontal();
 
                     GUILayout.Space(EditorGUIUtility.standardVerticalSpacing);
@@ -518,7 +521,7 @@ public override void OnGUI()
         private void HistoryDetailsEntry(GitLogEntry entry)
         {
             GUILayout.BeginVertical(Styles.HeaderBoxStyle);
-            GUILayout.Label(entry.Summary, Styles.HistoryDetailsTitleStyle, GUILayout.Width(Position.width));
+            GUILayout.Label(entry.Summary, Styles.HistoryDetailsTitleStyle);
 
             GUILayout.Space(-5);
 

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

@@ -424,7 +424,7 @@ public TreeNodeRenderResult Render(Rect rect, float indentation, bool isSelected
                 return renderResult;
 
             var fillRect = rect;
-            var nodeStartX = Level * indentation;
+            var nodeStartX = Level * indentation + rect.x;
             nodeStartX += 2 * level;
 
             var nodeRect = new Rect(nodeStartX, rect.y, fillRect.width - nodeStartX, rect.height);