From 077a96007b61d15c783c6c07383712e74f9999ed Mon Sep 17 00:00:00 2001 From: hishitetsu <66369541+hishitetsu@users.noreply.github.com> Date: Thu, 30 Mar 2023 11:07:14 +0900 Subject: [PATCH] Clear highlight in last blade --- src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs | 2 +- src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml.cs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs index 94ce4812d03b..3646d7576504 100644 --- a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs +++ b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml.cs @@ -60,7 +60,7 @@ private void ColumnViewBase_ItemInvoked(object? sender, EventArgs e) openedFolderPresenter = FileList.ContainerFromItem(FileList.SelectedItem) as ListViewItem; } - private void ClearOpenedFolderSelectionIndicator() + internal void ClearOpenedFolderSelectionIndicator() { if (openedFolderPresenter is null) return; diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml.cs b/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml.cs index f7523f8b858b..ea404aa602b2 100644 --- a/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml.cs +++ b/src/Files.App/Views/LayoutModes/ColumnViewBrowser.xaml.cs @@ -429,7 +429,10 @@ private void CloseUnnecessaryColumns(ColumnParam column) var destComponents = StorageFileExtensions.GetDirectoryPathComponents(column.NavPathParam); var (_, relativeIndex) = GetLastCommonAndRelativeIndex(destComponents, columnPath, columnFirstPath); if (relativeIndex >= 0) + { + ColumnHost.ActiveBlades[relativeIndex].FindDescendant()?.ClearOpenedFolderSelectionIndicator(); DismissOtherBlades(relativeIndex); + } } private (int, int) GetLastCommonAndRelativeIndex(List destComponents, string columnPath, string columnFirstPath)