Skip to content

[BUG] [Windows] UniformItemsLayout item positioning not correct #1553 #1566

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

Merged
VladislavAntonyuk merged 2 commits into from
Nov 26, 2023
Merged

[BUG] [Windows] UniformItemsLayout item positioning not correct #1553 #1566

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
b9b8d5f
[BUG] [Windows] UniformItemsLayout item positioning not correct #1553
VladislavAntonyuk Nov 26, 2023
7af154c
Merge branch 'main' into 1553-uniformitemslayout-fix-size
TheCodeTraveler Nov 26, 2023
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
9 changes: 7 additions & 2 deletions src/CommunityToolkit.Maui.Core/Layouts/UniformItemsLayoutManager.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,15 @@ public override Size ArrangeChildren(Rect rectangle)
var width = rectangle.Width - uniformItemsLayout.Padding.HorizontalThickness;
var visibleChildren = uniformItemsLayout.Where(x => x.Visibility == Visibility.Visible).ToArray();

if (visibleChildren.Length == 0 || width == 0)
{
return rectangle.Size;
}

var columns = GetColumnsCount(visibleChildren.Length, width);
var rows = GetRowsCount(visibleChildren.Length, columns);

var boundsWidth = columns == 0 ? 0 : width / columns;
var boundsWidth = width / columns;
Comment thread
TheCodeTraveler marked this conversation as resolved.
var boundsHeight = childHeight;
var bounds = new Rect(0, 0, boundsWidth, boundsHeight);
var count = 0;
Expand All @@ -51,7 +56,7 @@ public override Size ArrangeChildren(Rect rectangle)
}
}

return bounds.Size;
return rectangle.Size;
}

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions src/CommunityToolkit.Maui.UnitTests/Layouts/UniformItemsLayoutTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,14 @@ public void MaxRowsArrangeChildrenUniformItemsLayout()
[Fact]
public void ArrangeChildrenUniformItemsLayout()
{
var expectedSize = new Size(childWidth, childHeight);
uniformChild = new TestView(expectedSize);
var childSize = new Size(childWidth, childHeight);
uniformChild = new TestView(childSize);
uniformItemsLayout.CrossPlatformMeasure(double.PositiveInfinity, double.PositiveInfinity);
var rect = new Rect(0, 0, childWidth * childCount, childHeight * childCount);
uniformItemsLayout.Layout(rect);
var actualSize = uniformItemsLayout.CrossPlatformArrange(rect);

Assert.Equal(expectedSize, actualSize);
Assert.Equal(childSize * childCount, actualSize);
}

class TestView : View
Expand Down