Init

Author: 0x5bfa

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

@@ -42,7 +42,7 @@ public BreadcrumbBar()
 		{
 			DefaultStyleKey = typeof(BreadcrumbBar);
 
-			_itemsRepeaterLayout = new(this, 2d);
+			_itemsRepeaterLayout = new(this);
 		}
 
 		// Methods

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

@@ -5,13 +5,14 @@
 	xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
 	xmlns:local="using:Files.App.Controls">
 
-	<x:Double x:Key="BreadcrumbBarHeight">32</x:Double>
+	<x:Double x:Key="BreadcrumbBarHeight">34</x:Double>
 	<x:Double x:Key="BreadcrumbBarMinWidth">120</x:Double>
 	<x:Double x:Key="BreadcrumbBarEllipsisFontSize">16</x:Double>
 
 	<Thickness x:Key="BreadcrumbBarChevronPadding">4,0</Thickness>
 	<Thickness x:Key="BreadcrumbBarItemPadding">8,0</Thickness>
 	<Thickness x:Key="BreadcrumbBarRootItemPadding">16,0,8,0</Thickness>
+	<Thickness x:Key="BreadcrumbBarItemMargin">2,0,0,0</Thickness>
 
 	<CornerRadius x:Key="BreadcrumbBarItemCornerRadius">2,2,2,2</CornerRadius>
 	<CornerRadius x:Key="BreadcrumbBarChevronCornerRaduis">2,2,2,2</CornerRadius>
@@ -21,15 +22,28 @@
 	<Style BasedOn="{StaticResource DefaultBreadcrumbBarItemStyle}" TargetType="local:BreadcrumbBarItem" />
 
 	<Style x:Key="DefaultBreadcrumbBarStyle" TargetType="local:BreadcrumbBar">
+
+		<Setter Property="Background" Value="Transparent" />
+
 		<Setter Property="MinWidth" Value="{StaticResource BreadcrumbBarMinWidth}" />
+
+		<Setter Property="HorizontalAlignment" Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment" Value="Center" />
+		<Setter Property="VerticalAlignment" Value="Stretch" />
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+
 		<Setter Property="AutomationProperties.LandmarkType" Value="Navigation" />
+
 		<Setter Property="IsTabStop" Value="False" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="local:BreadcrumbBar">
 					<Grid
 						MinWidth="{TemplateBinding MinWidth}"
-						ColumnSpacing="2"
+						HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+						VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+						Background="{TemplateBinding Background}"
 						TabFocusNavigation="Once"
 						XYFocusKeyboardNavigation="Enabled">
 						<Grid.ColumnDefinitions>
@@ -50,6 +64,7 @@
 						<local:BreadcrumbBarItem
 							x:Name="PART_EllipsisBreadcrumbBarItem"
 							Grid.Column="1"
+							Margin="{StaticResource BreadcrumbBarItemMargin}"
 							AutomationProperties.AccessibilityView="Content"
 							IsEllipsis="True"
 							Visibility="Collapsed">
@@ -59,6 +74,7 @@
 						<ItemsRepeater
 							x:Name="PART_MainItemsRepeater"
 							Grid.Column="2"
+							Margin="{StaticResource BreadcrumbBarItemMargin}"
 							ItemTemplate="{Binding ItemTemplate, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
 							ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
 
@@ -85,7 +101,7 @@
 		<Setter Property="HorizontalAlignment" Value="Stretch" />
 		<Setter Property="HorizontalContentAlignment" Value="Center" />
 		<Setter Property="VerticalAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="VerticalContentAlignment" Value="Stretch" />
 
 		<Setter Property="FocusVisualMargin" Value="1" />
 		<Setter Property="IsTabStop" Value="False" />
@@ -95,7 +111,6 @@
 				<ControlTemplate TargetType="local:BreadcrumbBarItem">
 					<Grid
 						x:Name="PART_LayoutRoot"
-						ColumnSpacing="2"
 						TabFocusNavigation="Once"
 						XYFocusKeyboardNavigation="Enabled">
 						<Grid.ColumnDefinitions>
@@ -107,7 +122,7 @@
 						<Button
 							x:Name="PART_ItemContentButton"
 							Padding="{TemplateBinding Padding}"
-							VerticalAlignment="Stretch"
+							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
 							AutomationProperties.AccessibilityView="Raw"
 							Background="{TemplateBinding Background}"
 							BorderBrush="{TemplateBinding BorderBrush}"
@@ -151,8 +166,9 @@
 						<Button
 							x:Name="PART_ItemChevronButton"
 							Grid.Column="1"
+							Margin="{StaticResource BreadcrumbBarItemMargin}"
 							Padding="{StaticResource BreadcrumbBarChevronPadding}"
-							VerticalAlignment="Stretch"
+							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
 							AutomationProperties.AccessibilityView="Content"
 							Background="{TemplateBinding Background}"
 							BorderBrush="{TemplateBinding BorderBrush}"

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

@@ -13,7 +13,6 @@ public partial class BreadcrumbBarLayout : NonVirtualizingLayout
 		// Fields
 
 		private readonly WeakReference<BreadcrumbBar>? _ownerRef;
-		private readonly double _spacing = 0d;
 
 		private Size _availableSize;
 		private BreadcrumbBarItem? _ellipsisButton = null;
@@ -24,10 +23,9 @@ public partial class BreadcrumbBarLayout : NonVirtualizingLayout
 		public int IndexAfterEllipsis { get; private set; }
 		public int VisibleItemsCount { get; private set; }
 
-		public BreadcrumbBarLayout(BreadcrumbBar breadcrumb, double spacing)
+		public BreadcrumbBarLayout(BreadcrumbBar breadcrumb)
 		{
 			_ownerRef = new(breadcrumb);
-			_spacing = spacing;
 		}
 
 		protected override Size MeasureOverride(NonVirtualizingLayoutContext context, Size availableSize)
@@ -79,7 +77,6 @@ protected override Size ArrangeOverride(NonVirtualizingLayoutContext context, Si
 						breadcrumbItem.Arrange(new Rect(accumulatedWidths, 0, breadcrumbItem.DesiredSize.Width, breadcrumbItem.DesiredSize.Height));
 
 						accumulatedWidths += breadcrumbItem.DesiredSize.Width;
-						accumulatedWidths += _spacing;
 
 						VisibleItemsCount++;
 					}
@@ -95,9 +92,9 @@ protected override Size ArrangeOverride(NonVirtualizingLayoutContext context, Si
 		private int GetFirstIndexToRender(NonVirtualizingLayoutContext context)
 		{
 			var itemCount = context.Children.Count;
-			var accumulatedWidth = _spacing;
+			var accumulatedWidth = 0d;
 
-			// Go through all items from the end
+			// Go through all items from the last item
 			for (int index = itemCount - 1; index >= 0; index--)
 			{
 				var newAccumulatedWidth = accumulatedWidth + context.Children[index].DesiredSize.Width;

src/Files.App.Controls/Omnibar/Omnibar.Properties.cs

@@ -2,13 +2,6 @@
 // Licensed under the MIT License.
 
 using CommunityToolkit.WinUI;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-using Microsoft.UI.Xaml.Markup;
-using Microsoft.UI.Xaml.Shapes;
-using System.Linq;
-using System.Collections.Generic;
 
 namespace Files.App.Controls
 {
@@ -19,5 +12,8 @@ public partial class Omnibar
 
 		[GeneratedDependencyProperty]
 		public partial OmnibarMode? CurrentSelectedMode { get; set; }
+
+		[GeneratedDependencyProperty]
+		public partial Thickness AutoSuggestBoxPadding { get; set; }
 	}
 }