From 06ab70928d89702b675be91f3743546a9393a1a9 Mon Sep 17 00:00:00 2001 From: BobLd <38405645+BobLd@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:15:45 +0000 Subject: [PATCH] Ensure VirtualizingStackPanel correct element size estimate and fix #17460 (#17461) Co-authored-by: Emmanuel Hansen --- src/Avalonia.Controls/VirtualizingStackPanel.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Controls/VirtualizingStackPanel.cs b/src/Avalonia.Controls/VirtualizingStackPanel.cs index 173358bc4c..adeebf97d9 100644 --- a/src/Avalonia.Controls/VirtualizingStackPanel.cs +++ b/src/Avalonia.Controls/VirtualizingStackPanel.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Diagnostics; -using System.Drawing; using System.Linq; using Avalonia.Controls.Primitives; using Avalonia.Controls.Utils; @@ -164,6 +163,9 @@ namespace Avalonia.Controls _realizedElements ??= new(); _measureElements ??= new(); + // We need to set the lastEstimatedElementSizeU before calling CalculateDesiredSize() + _ = EstimateElementSizeU(); + // We handle horizontal and vertical layouts here so X and Y are abstracted to: // - Horizontal layouts: U = horizontal, V = vertical // - Vertical layouts: U = vertical, V = horizontal