Fix collection default spacing, also re-enable the failing test (#17261)

Co-authored-by: Mike Corsaro <mikecorsaro@microsoft.com>
dotnet · Sep 8, 2023 · 65edfe0 · 65edfe0
1 parent 2068ae8
commit 65edfe0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/CollectionViewExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/CollectionViewExtensions.cs
@@ -19,9 +19,19 @@ public static class CollectionViewExtensions
 
 			var style = new WStyle(typeof(GridViewItem));
 
+			if (layout?.Orientation == ItemsLayoutOrientation.Vertical)
+			{
+				style.Setters.Add(new WSetter(FrameworkElement.MinHeightProperty, 0));
+				style.Setters.Add(new WSetter(Control.HorizontalContentAlignmentProperty, HorizontalAlignment.Stretch));
+			}
+			else if (layout?.Orientation == ItemsLayoutOrientation.Horizontal)
+			{
+				style.Setters.Add(new WSetter(FrameworkElement.MinWidthProperty, 0));
+				style.Setters.Add(new WSetter(Control.VerticalContentAlignmentProperty, VerticalAlignment.Stretch));
+			}
+
 			style.Setters.Add(new WSetter(FrameworkElement.MarginProperty, margin));
 			style.Setters.Add(new WSetter(Control.PaddingProperty, WinUIHelpers.CreateThickness(0)));
-			style.Setters.Add(new WSetter(Control.HorizontalContentAlignmentProperty, HorizontalAlignment.Stretch));
 
 			return style;
 		}
@@ -37,9 +47,19 @@ public static class CollectionViewExtensions
 
 			var style = new WStyle(typeof(GridViewItem));
 
+			if (layout?.Orientation == ItemsLayoutOrientation.Vertical)
+			{
+				style.Setters.Add(new WSetter(FrameworkElement.MinHeightProperty, 0));
+				style.Setters.Add(new WSetter(Control.HorizontalContentAlignmentProperty, HorizontalAlignment.Stretch));
+			}
+			else if (layout?.Orientation == ItemsLayoutOrientation.Horizontal)
+			{
+				style.Setters.Add(new WSetter(FrameworkElement.MinWidthProperty, 0));
+				style.Setters.Add(new WSetter(Control.VerticalContentAlignmentProperty, VerticalAlignment.Stretch));
+			}
+
 			style.Setters.Add(new WSetter(FrameworkElement.MarginProperty, margin));
 			style.Setters.Add(new WSetter(Control.PaddingProperty, WinUIHelpers.CreateThickness(0)));
-			style.Setters.Add(new WSetter(Control.HorizontalContentAlignmentProperty, HorizontalAlignment.Stretch));
 
 			return style;
 		}

diff --git a/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Windows.cs b/src/Controls/tests/DeviceTests/Elements/CollectionView/CollectionViewTests.Windows.cs
@@ -54,7 +54,7 @@ await CreateHandlerAndAddToWindow<LayoutHandler>(layout, (handler) =>
 			});
 		}
 
-		[Fact(Skip = "FIX FOR .NET8")]
+		[Fact]
 		public async Task ValidateItemContainerDefaultHeight()
 		{
 			SetupBuilder();