Skip to content

Commit f82616e

Browse files
authored
Merge pull request #6 from romanpolunin/dev
all fixes for nuget package v1.0.1
2 parents 0d77acf + 844437f commit f82616e

28 files changed

+2756
-1602
lines changed

CSharp/OrgChart.CSharp.SharedSource/Layout/Boundary.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public struct Step
2626
/// Which <see cref="Node"/> holds this edge.
2727
/// </summary>
2828
[NotNull]
29-
public readonly BoxTree.TreeNode Node;
29+
public readonly BoxTree.Node Node;
3030
/// <summary>
3131
/// Horizontal position of the edge.
3232
/// </summary>
@@ -43,7 +43,7 @@ public struct Step
4343
/// <summary>
4444
/// Ctr.
4545
/// </summary>
46-
public Step([NotNull]BoxTree.TreeNode node, double x, double top, double bottom)
46+
public Step([NotNull]BoxTree.Node node, double x, double top, double bottom)
4747
{
4848
Node = node;
4949
X = x;
@@ -70,7 +70,7 @@ public Step ChangeBottom(double newBottom)
7070
/// <summary>
7171
/// Returns a new <see cref="Step"/> whose <see cref="Node"/> property was set to <paramref name="newNode"/> and <see cref="X"/> to <paramref name="newX"/>.
7272
/// </summary>
73-
public Step ChangeOwner([NotNull]BoxTree.TreeNode newNode, double newX)
73+
public Step ChangeOwner([NotNull]BoxTree.Node newNode, double newX)
7474
{
7575
return new Step(newNode, newX, Top, Bottom);
7676
}
@@ -126,7 +126,7 @@ private Boundary(bool frompublic)
126126
/// <summary>
127127
/// Resets the edges, use when re-using this object from pool.
128128
/// </summary>
129-
public void PrepareForHorizontalLayout([NotNull]BoxTree.TreeNode node)
129+
public void PrepareForHorizontalLayout([NotNull]BoxTree.Node node)
130130
{
131131
Prepare(node);
132132

@@ -144,7 +144,7 @@ public void PrepareForHorizontalLayout([NotNull]BoxTree.TreeNode node)
144144
/// <summary>
145145
/// Resets the edges, use when re-using this object from pool.
146146
/// </summary>
147-
public void Prepare([NotNull]BoxTree.TreeNode node)
147+
public void Prepare([NotNull]BoxTree.Node node)
148148
{
149149
Left.Clear();
150150
Right.Clear();
@@ -409,7 +409,7 @@ private void ValidateState()
409409
/// <summary>
410410
/// Merges a box into this one, potentially pushing its edges out.
411411
/// </summary>
412-
public void MergeFrom([NotNull]BoxTree.TreeNode node)
412+
public void MergeFrom([NotNull]BoxTree.Node node)
413413
{
414414
if (node.Element.DisableCollisionDetection)
415415
{
@@ -480,7 +480,7 @@ public double ComputeOverlap([NotNull]Boundary other, double siblingSpacing, dou
480480
/// <summary>
481481
/// Re-initializes left and right edges based on actual coordinates of boxes.
482482
/// </summary>
483-
public void ReloadFromBranch(BoxTree.TreeNode branchRoot)
483+
public void ReloadFromBranch(BoxTree.Node branchRoot)
484484
{
485485
var leftmost = double.MaxValue;
486486
var rightmost = double.MinValue;

0 commit comments

Comments
 (0)