update logic regarding 0-width items

vgromfeld · vgromfeld · commit 767f3b599cac · 2021-03-23T18:56:38.000+01:00
diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs b/Microsoft.Toolkit.Uwp.UI.Controls.Primitives/WrapPanel/WrapPanel.cs
@@ -209,12 +209,12 @@ private Size UpdateRows(Size availableSize)
             var finalMeasure = new UvMeasure(Orientation, width: 0.0, height: 0.0);
             void Arrange(UIElement child, bool isLast = false)
             {
-                var desiredMeasure = new UvMeasure(Orientation, child.DesiredSize);
-                if (desiredMeasure.U == 0)
+                if (child.Visibility == Visibility.Collapsed)
                 {
                     return; // if an item is collapsed, avoid adding the spacing
                 }
 
+                var desiredMeasure = new UvMeasure(Orientation, child.DesiredSize);
                 if ((desiredMeasure.U + position.U + paddingEnd.U) > parentMeasure.U)
                 {
                     // next row!

Original file line number	Diff line number	Diff line change
`@@ -209,12 +209,12 @@ private Size UpdateRows(Size availableSize)`
`209`	`209`	`var finalMeasure = new UvMeasure(Orientation, width: 0.0, height: 0.0);`
`210`	`210`	`void Arrange(UIElement child, bool isLast = false)`
`211`	`211`	`{`
`212`		`- var desiredMeasure = new UvMeasure(Orientation, child.DesiredSize);`
`213`		`- if (desiredMeasure.U == 0)`
	`212`	`+ if (child.Visibility == Visibility.Collapsed)`
`214`	`213`	`{`
`215`	`214`	`return; // if an item is collapsed, avoid adding the spacing`
`216`	`215`	`}`
`217`	`216`
	`217`	`+ var desiredMeasure = new UvMeasure(Orientation, child.DesiredSize);`
`218`	`218`	`if ((desiredMeasure.U + position.U + paddingEnd.U) > parentMeasure.U)`
`219`	`219`	`{`
`220`	`220`	`// next row!`