Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Account for starting coordinates when handling layout alignment #1158

Merged
merged 2 commits into from
Jun 4, 2021
Merged

Account for starting coordinates when handling layout alignment #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
916d577
Account for starting coordinates when handling layout alignment
hartez Jun 2, 2021
33976f0
Simplify
hartez Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/Core/src/Layouts/LayoutExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,14 @@ static double AlignHorizontal(double startX, double startMargin, double endMargi

case LayoutAlignment.Center:

frameX = (boundsWidth - desiredWidth) / 2;
frameX = startX + ((boundsWidth - desiredWidth) / 2);
var marginOffset = (startMargin - endMargin) / 2;
frameX += marginOffset;

break;
case LayoutAlignment.End:

frameX = boundsWidth - endMargin - desiredWidth;
frameX = startX + boundsWidth - endMargin - desiredWidth;
break;
}

Expand All @@ -125,29 +125,26 @@ static double AlignHorizontal(double startX, double startMargin, double endMargi
static double AlignVertical(IFrameworkElement frameworkElement, Rectangle bounds, Thickness margin)
{
double frameY = 0;
var startY = bounds.Y;

switch (frameworkElement.VerticalLayoutAlignment)
{
case LayoutAlignment.Fill:

frameY = bounds.Y + margin.Top;
break;

case LayoutAlignment.Start:

frameY = bounds.Y + margin.Top;
frameY = startY + margin.Top;
break;

case LayoutAlignment.Center:

frameY = (bounds.Height - frameworkElement.DesiredSize.Height) / 2;
frameY = startY + ((bounds.Height - frameworkElement.DesiredSize.Height) / 2);
var offset = (margin.Top - margin.Bottom) / 2;
frameY += offset;
break;

case LayoutAlignment.End:

frameY = bounds.Height - margin.Bottom - frameworkElement.DesiredSize.Height;
frameY = startY + bounds.Height - margin.Bottom - frameworkElement.DesiredSize.Height;
break;
}

Expand Down
79 changes: 49 additions & 30 deletions src/Core/tests/UnitTests/Layouts/LayoutExtensionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,31 +82,41 @@ public void DesiredSizeIncludesMargin()
public static IEnumerable<object[]> AlignmentTestData()
{
var margin = Thickness.Zero;
var point = Point.Zero;

// No margin
yield return new object[] { LayoutAlignment.Start, margin, 0, 100 };
yield return new object[] { LayoutAlignment.Center, margin, 100, 100 };
yield return new object[] { LayoutAlignment.End, margin, 200, 100 };
yield return new object[] { LayoutAlignment.Fill, margin, 0, 300 };
yield return new object[] { LayoutAlignment.Start, point, margin, 0, 100 };
yield return new object[] { LayoutAlignment.Center, point, margin, 100, 100 };
yield return new object[] { LayoutAlignment.End, point, margin, 200, 100 };
yield return new object[] { LayoutAlignment.Fill, point, margin, 0, 300 };

// Even margin
margin = new Thickness(10);
yield return new object[] { LayoutAlignment.Start, margin, 10, 100 };
yield return new object[] { LayoutAlignment.Center, margin, 100, 100 };
yield return new object[] { LayoutAlignment.End, margin, 190, 100 };
yield return new object[] { LayoutAlignment.Fill, margin, 10, 280 };
yield return new object[] { LayoutAlignment.Start, point, margin, 10, 100 };
yield return new object[] { LayoutAlignment.Center, point, margin, 100, 100 };
yield return new object[] { LayoutAlignment.End, point, margin, 190, 100 };
yield return new object[] { LayoutAlignment.Fill, point, margin, 10, 280 };

//// Lopsided margin
margin = new Thickness(5, 5, 10, 10);
yield return new object[] { LayoutAlignment.Start, margin, 5, 100 };
yield return new object[] { LayoutAlignment.Center, margin, 97.5, 100 };
yield return new object[] { LayoutAlignment.End, margin, 190, 100 };
yield return new object[] { LayoutAlignment.Fill, margin, 5, 285 };
yield return new object[] { LayoutAlignment.Start, point, margin, 5, 100 };
yield return new object[] { LayoutAlignment.Center, point, margin, 97.5, 100 };
yield return new object[] { LayoutAlignment.End, point, margin, 190, 100 };
yield return new object[] { LayoutAlignment.Fill, point, margin, 5, 285 };

// X and Y offsets (e.g., GridLayout columns and rows)
margin = Thickness.Zero;
point = new Point(10, 10);
yield return new object[] { LayoutAlignment.Start, point, margin, 10, 100 };
yield return new object[] { LayoutAlignment.Center, point, margin, 110, 100 };
yield return new object[] { LayoutAlignment.End, point, margin, 210, 100 };
yield return new object[] { LayoutAlignment.Fill, point, margin, 10, 300 };

}

[Theory]
[MemberData(nameof(AlignmentTestData))]
public void FrameAccountsForHorizontalLayoutAlignment(LayoutAlignment layoutAlignment, Thickness margin,
public void FrameAccountsForHorizontalLayoutAlignment(LayoutAlignment layoutAlignment, Point offset, Thickness margin,
double expectedX, double expectedWidth)
{
var widthConstraint = 300;
Expand All @@ -121,15 +131,15 @@ public void FrameAccountsForHorizontalLayoutAlignment(LayoutAlignment layoutAlig
element.Width.Returns(-1);
element.Height.Returns(-1);

var frame = element.ComputeFrame(new Rectangle(0, 0, widthConstraint, heightConstraint));
var frame = element.ComputeFrame(new Rectangle(offset.X, offset.Y, widthConstraint, heightConstraint));

Assert.Equal(expectedX, frame.Left);
Assert.Equal(expectedWidth, frame.Width);
}

[Theory]
[MemberData(nameof(AlignmentTestData))]
public void FrameAccountsForVerticalLayoutAlignment(LayoutAlignment layoutAlignment, Thickness margin,
public void FrameAccountsForVerticalLayoutAlignment(LayoutAlignment layoutAlignment, Point offset, Thickness margin,
double expectedY, double expectedHeight)
{
var widthConstraint = 50;
Expand All @@ -144,7 +154,7 @@ public void FrameAccountsForVerticalLayoutAlignment(LayoutAlignment layoutAlignm
element.Width.Returns(-1);
element.Height.Returns(-1);

var frame = element.ComputeFrame(new Rectangle(0, 0, widthConstraint, heightConstraint));
var frame = element.ComputeFrame(new Rectangle(offset.X, offset.Y, widthConstraint, heightConstraint));

Assert.Equal(expectedY, frame.Top);
Assert.Equal(expectedHeight, frame.Height);
Expand All @@ -153,31 +163,40 @@ public void FrameAccountsForVerticalLayoutAlignment(LayoutAlignment layoutAlignm
public static IEnumerable<object[]> AlignmentTestDataRtl()
{
var margin = Thickness.Zero;
var point = Point.Zero;

// No margin
yield return new object[] { LayoutAlignment.Start, margin, 200, 100 };
yield return new object[] { LayoutAlignment.Center, margin, 100, 100 };
yield return new object[] { LayoutAlignment.End, margin, 0, 100 };
yield return new object[] { LayoutAlignment.Fill, margin, 0, 300 };
yield return new object[] { LayoutAlignment.Start, point, margin, 200, 100 };
yield return new object[] { LayoutAlignment.Center, point, margin, 100, 100 };
yield return new object[] { LayoutAlignment.End, point, margin, 0, 100 };
yield return new object[] { LayoutAlignment.Fill, point, margin, 0, 300 };

// Even margin
margin = new Thickness(10);
yield return new object[] { LayoutAlignment.Start, margin, 190, 100 };
yield return new object[] { LayoutAlignment.Center, margin, 100, 100 };
yield return new object[] { LayoutAlignment.End, margin, 10, 100 };
yield return new object[] { LayoutAlignment.Fill, margin, 10, 280 };
yield return new object[] { LayoutAlignment.Start, point, margin, 190, 100 };
yield return new object[] { LayoutAlignment.Center, point, margin, 100, 100 };
yield return new object[] { LayoutAlignment.End, point, margin, 10, 100 };
yield return new object[] { LayoutAlignment.Fill, point, margin, 10, 280 };

// Lopsided margin
margin = new Thickness(5, 5, 10, 10);
yield return new object[] { LayoutAlignment.Start, margin, 195, 100 };
yield return new object[] { LayoutAlignment.Center, margin, 102.5, 100 };
yield return new object[] { LayoutAlignment.End, margin, 10, 100 };
yield return new object[] { LayoutAlignment.Fill, margin, 10, 285 };
yield return new object[] { LayoutAlignment.Start, point, margin, 195, 100 };
yield return new object[] { LayoutAlignment.Center, point, margin, 102.5, 100 };
yield return new object[] { LayoutAlignment.End, point, margin, 10, 100 };
yield return new object[] { LayoutAlignment.Fill, point, margin, 10, 285 };

// X and Y offsets (e.g., GridLayout columns and rows)
margin = Thickness.Zero;
point = new Point(10, 10);
yield return new object[] { LayoutAlignment.Start, point, margin, 210, 100 };
yield return new object[] { LayoutAlignment.Center, point, margin, 110, 100 };
yield return new object[] { LayoutAlignment.End, point, margin, 10, 100 };
yield return new object[] { LayoutAlignment.Fill, point, margin, 10, 300 };
}

[Theory]
[MemberData(nameof(AlignmentTestDataRtl))]
public void FrameAccountsForHorizontalLayoutAlignmentRtl(LayoutAlignment layoutAlignment, Thickness margin,
public void FrameAccountsForHorizontalLayoutAlignmentRtl(LayoutAlignment layoutAlignment, Point offset, Thickness margin,
double expectedX, double expectedWidth)
{
var widthConstraint = 300;
Expand All @@ -193,7 +212,7 @@ public void FrameAccountsForHorizontalLayoutAlignmentRtl(LayoutAlignment layoutA
element.Width.Returns(-1);
element.Height.Returns(-1);

var frame = element.ComputeFrame(new Rectangle(0, 0, widthConstraint, heightConstraint));
var frame = element.ComputeFrame(new Rectangle(offset.X, offset.Y, widthConstraint, heightConstraint));

Assert.Equal(expectedX, frame.Left);
Assert.Equal(expectedWidth, frame.Width);
Expand Down