Use the custom layouting class for ItemsRepeater of BreadcrumbBar

Author: 0x5bfa

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.cs

@@ -50,7 +50,7 @@ public BreadcrumbBar()
 		{
 			DefaultStyleKey = typeof(BreadcrumbBar);
 
-			_itemsRepeaterLayout = new(this);
+			_itemsRepeaterLayout = new(this, 2d);
 		}
 
 		// Methods
@@ -66,7 +66,7 @@ protected override void OnApplyTemplate()
 			_itemsRepeater = GetTemplateChild(TemplatePartName_MainItemsRepeater) as ItemsRepeater
 				?? throw new MissingFieldException($"Could not find {TemplatePartName_MainItemsRepeater} in the given {nameof(BreadcrumbBar)}'s style.");
 
-			//_itemsRepeater.Layout = _itemsRepeaterLayout;
+			_itemsRepeater.Layout = _itemsRepeaterLayout;
 
 			_rootItemButton.PointerEntered += RootItemButton_PointerEntered;
 			_rootItemButton.PointerPressed += RootItemButton_PointerPressed;

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml

@@ -88,11 +88,7 @@
 							x:Name="PART_MainItemsRepeater"
 							Grid.Column="2"
 							ItemTemplate="{Binding ItemTemplate, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
-							ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
-							<ItemsRepeater.Layout>
-								<StackLayout Orientation="Horizontal" Spacing="2" />
-							</ItemsRepeater.Layout>
-						</ItemsRepeater>
+							ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
 
 						<VisualStateManager.VisualStateGroups>
 

src/Files.App.Controls/BreadcrumbBar/BreadcrumbBarLayout.cs

@@ -17,14 +17,16 @@ public partial class BreadcrumbBarLayout : NonVirtualizingLayout
 		private Size _availableSize;
 		private BreadcrumbBarItem? _ellipsisButton = null;
 		private WeakReference<BreadcrumbBar>? _ownerRef;
+		private double _spacing = 0d;
 
 		private bool _ellipsisIsRendered;
 		private uint _firstRenderedItemIndexAfterEllipsis;
 		private uint _visibleItemsCount;
 
-		public BreadcrumbBarLayout(BreadcrumbBar breadcrumb)
+		public BreadcrumbBarLayout(BreadcrumbBar breadcrumb, double spacing)
 		{
 			_ownerRef = new(breadcrumb);
+			_spacing = spacing;
 		}
 
 		protected override Size MeasureOverride(NonVirtualizingLayoutContext context, Size availableSize)
@@ -54,16 +56,17 @@ protected override Size MeasureOverride(NonVirtualizingLayoutContext context, Si
 
 		protected override Size ArrangeOverride(NonVirtualizingLayoutContext context, Size finalSize)
 		{
-			float accumulatedWidths = 0f;
+			double accumulatedWidths = 0d;
 
 			// Go through all items and arrange them
 			foreach (var item in context.Children)
 			{
 				if (item is BreadcrumbBarItem breadcrumbItem)
 				{
-					breadcrumbItem.Arrange(new Rect(accumulatedWidths, 0, breadcrumbItem.DesiredSize.Width, finalSize.Height));
+					breadcrumbItem.Arrange(new Rect(accumulatedWidths, 0, breadcrumbItem.DesiredSize.Width, breadcrumbItem.DesiredSize.Height));
 
-					accumulatedWidths += (float)breadcrumbItem.Width;
+					accumulatedWidths += breadcrumbItem.DesiredSize.Width;
+					accumulatedWidths += _spacing;
 				}
 			}