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

Fix issue where setting StaggeredLayout.ColumnWidth to NaN would cause an exception #4064

Merged
3 commits merged into from
Jun 29, 2021
Merged

Fix issue where setting StaggeredLayout.ColumnWidth to NaN would cause an exception #4064

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b40f014
Fix issue where setting StaggeredLayout.ColumnWidth to NaN would caus…
winston-de Jun 4, 2021
8570e3c
added comments
winston-de Jun 4, 2021
f3416b3
Merge branch 'main' into #4063
michael-hawker Jun 29, 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
6 changes: 4 additions & 2 deletions Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,16 @@ protected override Size MeasureOverride(VirtualizingLayoutContext context, Size
double availableWidth = availableSize.Width;
double availableHeight = availableSize.Height;

double columnWidth = Math.Min(DesiredColumnWidth, availableWidth);
// This ternary prevents the column width from being NaN, which would otherwise cause an exception when measuring item sizes
double columnWidth = double.IsNaN(DesiredColumnWidth) ? availableWidth : Math.Min(DesiredColumnWidth, availableWidth);
if (columnWidth != state.ColumnWidth)
{
// The items will need to be remeasured
state.Clear();
}

state.ColumnWidth = Math.Min(DesiredColumnWidth, availableWidth);
// This ternary prevents the column width from being NaN, which would otherwise cause an exception when measuring item sizes
state.ColumnWidth = double.IsNaN(DesiredColumnWidth) ? availableWidth : Math.Min(DesiredColumnWidth, availableWidth);
int numColumns = Math.Max(1, (int)Math.Floor(availableWidth / state.ColumnWidth));

// adjust for column spacing on all columns expect the first
Expand Down