diff --git a/src/Avalonia.Controls/VirtualizingStackPanel.cs b/src/Avalonia.Controls/VirtualizingStackPanel.cs index b234686f5e..c262d416be 100644 --- a/src/Avalonia.Controls/VirtualizingStackPanel.cs +++ b/src/Avalonia.Controls/VirtualizingStackPanel.cs @@ -777,7 +777,7 @@ namespace Avalonia.Controls public IReadOnlyList GetIrregularSnapPoints(Orientation orientation, SnapPointsAlignment snapPointsAlignment) { var snapPoints = new List(); - + var itemCount = ItemsControl?.ItemsSource?.Count() ?? 0; switch (orientation) { case Orientation.Horizontal: @@ -787,7 +787,7 @@ namespace Avalonia.Controls { var averageElementSize = EstimateElementSizeU(); double snapPoint = 0; - for (var i = 0; i < Items.Count; i++) + for (var i = 0; i < itemCount; i++) { var container = ContainerFromIndex(i); if (container != null) @@ -834,7 +834,7 @@ namespace Avalonia.Controls { var averageElementSize = EstimateElementSizeU(); double snapPoint = 0; - for (var i = 0; i < Items.Count; i++) + for (var i = 0; i < itemCount; i++) { var container = ContainerFromIndex(i); if (container != null)