Merge branch 'fixes/simplify-tree-render-arguments' into enhancements/history-detail-tree-view

StanleyGoldman · StanleyGoldman · commit a7a3b2048420 · 2017-12-13T07:47:20.000-05:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs
@@ -84,8 +84,7 @@ public Rect Render(Rect treeDisplayRect, Vector2 scroll, Action<TNode> singleCli
                 if (titleDisplay)
                 {
                     var isSelected = SelectedNode == titleNode;
-                    renderResult = titleNode.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle,
-                        activeTreeNodeStyle);
+                    renderResult = titleNode.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle, activeTreeNodeStyle);
                 }
 
                 if (renderResult == TreeNodeRenderResult.VisibilityChange)
@@ -119,8 +118,7 @@ public Rect Render(Rect treeDisplayRect, Vector2 scroll, Action<TNode> singleCli
                 if (display)
                 {
                     var isSelected = SelectedNode == node;
-                    renderResult = node.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle,
-                        activeTreeNodeStyle);
+                    renderResult = node.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle, activeTreeNodeStyle);
                 }
 
                 if (renderResult == TreeNodeRenderResult.VisibilityChange)

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,7 @@ public Rect Render(Rect treeDisplayRect, Vector2 scroll, Action<TNode> singleCli`
`84`	`84`	`if (titleDisplay)`
`85`	`85`	`{`
`86`	`86`	`var isSelected = SelectedNode == titleNode;`
`87`		`- renderResult = titleNode.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle,`
`88`		`- activeTreeNodeStyle);`
	`87`	`+ renderResult = titleNode.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle, activeTreeNodeStyle);`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`if (renderResult == TreeNodeRenderResult.VisibilityChange)`
`@@ -119,8 +118,7 @@ public Rect Render(Rect treeDisplayRect, Vector2 scroll, Action<TNode> singleCli`
`119`	`118`	`if (display)`
`120`	`119`	`{`
`121`	`120`	`var isSelected = SelectedNode == node;`
`122`		`- renderResult = node.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle,`
`123`		`- activeTreeNodeStyle);`
	`121`	`+ renderResult = node.Render(rect, Styles.TreeIndentation, isSelected, FolderStyle, treeNodeStyle, activeTreeNodeStyle);`
`124`	`122`	`}`
`125`	`123`
`126`	`124`	`if (renderResult == TreeNodeRenderResult.VisibilityChange)`