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

winston-de · winston-de · commit b40f0142feb2 · 2021-06-04T15:02:49.000-07:00
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayout.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/StaggeredLayout/StaggeredLayout.cs
@@ -147,14 +147,14 @@ protected override Size MeasureOverride(VirtualizingLayoutContext context, Size
             double availableWidth = availableSize.Width;
             double availableHeight = availableSize.Height;
 
-            double columnWidth = Math.Min(DesiredColumnWidth, availableWidth);
+            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);
+            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

Original file line number	Diff line number	Diff line change
`@@ -147,14 +147,14 @@ protected override Size MeasureOverride(VirtualizingLayoutContext context, Size`
`147`	`147`	`double availableWidth = availableSize.Width;`
`148`	`148`	`double availableHeight = availableSize.Height;`
`149`	`149`
`150`		`- double columnWidth = Math.Min(DesiredColumnWidth, availableWidth);`
	`150`	`+ double columnWidth = double.IsNaN(DesiredColumnWidth) ? availableWidth : Math.Min(DesiredColumnWidth, availableWidth);`
`151`	`151`	`if (columnWidth != state.ColumnWidth)`
`152`	`152`	`{`
`153`	`153`	`// The items will need to be remeasured`
`154`	`154`	`state.Clear();`
`155`	`155`	`}`
`156`	`156`
`157`		`- state.ColumnWidth = Math.Min(DesiredColumnWidth, availableWidth);`
	`157`	`+ state.ColumnWidth = double.IsNaN(DesiredColumnWidth) ? availableWidth : Math.Min(DesiredColumnWidth, availableWidth);`
`158`	`158`	`int numColumns = Math.Max(1, (int)Math.Floor(availableWidth / state.ColumnWidth));`
`159`	`159`
`160`	`160`	`// adjust for column spacing on all columns expect the first`