Fix: Fixed column tracing in Columns View (#18650)

Author: yair100

src/Files.App/Views/Layouts/ColumnLayoutPage.xaml

@@ -148,6 +148,10 @@
 			<Setter Property="Padding" Value="4,0" />
 		</Style>
 
+		<Style x:Key="PathTracedRowStyle" TargetType="Grid">
+			<Setter Property="Background" Value="{ThemeResource ListViewItemBackgroundSelected}" />
+		</Style>
+
 	</local:BaseGroupableLayoutPage.Resources>
 
 	<Grid x:Name="RootGrid" ContextFlyout="{x:Bind BaseContextMenuFlyout}">

src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs

@@ -8,7 +8,6 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
-using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
 using System.IO;
 using Windows.Storage;
@@ -88,6 +87,19 @@ public ColumnLayoutPage() : base()
 			doubleClickTimer = DispatcherQueue.CreateTimer();
 		}
 
+		private void SetOpenedFolder(ListViewItem? lvi)
+		{
+			SetRowStyle(openedFolderPresenter, null);
+			openedFolderPresenter = lvi;
+			SetRowStyle(openedFolderPresenter, this.Resources["PathTracedRowStyle"] as Style);
+		}
+
+		private static void SetRowStyle(ListViewItem? lvi, Style? style)
+		{
+			if (lvi?.FindDescendant<Grid>() is Grid row)
+				row.Style = style;
+		}
+
 		// Methods
 
 		private void OnItemLoadStatusChanged(object sender, ItemLoadStatusChangedEventArgs args)
@@ -117,19 +129,10 @@ private void ColumnViewBase_GotFocus(object sender, RoutedEventArgs e)
 
 		private void ColumnViewBase_ItemInvoked(object? sender, EventArgs e)
 		{
-			ClearOpenedFolderSelectionIndicator();
-			openedFolderPresenter = FileList.ContainerFromItem(FileList.SelectedItem) as ListViewItem;
+			SetOpenedFolder(FileList.ContainerFromItem(FileList.SelectedItem) as ListViewItem);
 		}
 
-		internal void ClearOpenedFolderSelectionIndicator()
-		{
-			if (openedFolderPresenter is null)
-				return;
-
-			openedFolderPresenter.Background = new SolidColorBrush(Microsoft.UI.Colors.Transparent);
-			SetFolderBackground(openedFolderPresenter, new SolidColorBrush(Microsoft.UI.Colors.Transparent));
-			openedFolderPresenter = null;
-		}
+		internal void ClearOpenedFolderSelectionIndicator() => SetOpenedFolder(null);
 
 		protected override void ItemManipulationModel_ScrollIntoViewInvoked(object? sender, ListedItem e)
 		{
@@ -196,9 +199,7 @@ private void HighlightPathDirectory(ListViewBase sender, ContainerContentChangin
 			if (args.Item is ListedItem item && columnsOwner?.OwnerPath is string ownerPath
 				&& (ownerPath == item.ItemPath || (ownerPath.Length > item.ItemPath.Length && ownerPath.StartsWith(item.ItemPath) && ownerPath[item.ItemPath.Length] is '/' or '\\')))
 			{
-				SetFolderBackground(args.ItemContainer as ListViewItem, this.Resources["ListViewItemBackgroundSelected"] as SolidColorBrush);
-
-				openedFolderPresenter = FileList.ContainerFromItem(item) as ListViewItem;
+				SetOpenedFolder(FileList.ContainerFromItem(item) as ListViewItem);
 				FileList.ContainerContentChanging -= HighlightPathDirectory;
 			}
 		}
@@ -338,11 +339,6 @@ protected override void OnSelectionChanged(SelectionChangedEventArgs e)
 			if (e.AddedItems.Count > 0)
 				columnsOwner?.HandleSelectionChange(this);
 
-			if (e.RemovedItems.Count > 0 && openedFolderPresenter != null)
-			{
-				SetFolderBackground(openedFolderPresenter, this.Resources["ListViewItemBackgroundSelected"] as SolidColorBrush);
-			}
-
 			if (SelectedItems?.Count == 1 && SelectedItem?.PrimaryItemAttribute is StorageItemTypes.Folder)
 			{
 				TryOpenSelectedFolder();
@@ -692,16 +688,5 @@ internal void ClearSelectionIndicator()
 			FileList.SelectedItem = null;
 			LockPreviewPaneContent = false;
 		}
-
-		private static void SetFolderBackground(ListViewItem? lvi, SolidColorBrush? backgroundColor)
-		{
-			if (lvi == null || backgroundColor == null) return;
-
-
-			if (lvi.FindDescendant<Grid>() is Grid presenter)
-			{
-				presenter.Background = backgroundColor;
-			}
-		}
 	}
 }