Skip to content

Commit 6daf4fa

Browse files
committed
Update ShellViewModel.cs
1 parent 979e8dd commit 6daf4fa

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

src/Files.App/ViewModels/ShellViewModel.cs

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,7 @@ public string? FilesAndFoldersFilter
754754
{
755755
if (SetProperty(ref _filesAndFoldersFilter, value))
756756
{
757+
// Apply the updated filter to the files and folders list
757758
FilesAndFolderFilterUpdated();
758759
}
759760
}
@@ -764,12 +765,26 @@ private void FilesAndFolderFilterUpdated()
764765
_ = ApplyFilesAndFoldersChangesAsync();
765766
}
766767

768+
/// <summary>
769+
/// Clears the files and folder filter.
770+
/// This is used when the directory is changed or refreshed.
771+
/// </summary>
767772
private void ClearFilesAndFolderFilter()
768773
{
769-
if (!string.IsNullOrEmpty(FilesAndFoldersFilter) && UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems)
774+
// Hide the filter header if:
775+
// - Keyboard behavior is set to filter items
776+
// - A filter is currently applied
777+
//
778+
// Keep the header visible if:
779+
// - The filter is already empty (e.g. opened manually)
780+
if (UserSettingsService.FoldersSettingsService.KeyboardTypingBehavior == KeyboardTypingBehavior.FilterItems &&
781+
!string.IsNullOrEmpty(FilesAndFoldersFilter))
782+
{
770783
UserSettingsService.GeneralSettingsService.ShowFilterHeader = false;
784+
}
771785

772-
FilesAndFoldersFilter = null;
786+
// Clear the filter
787+
FilesAndFoldersFilter = string.Empty;
773788
}
774789

775790
// Apply changes immediately after manipulating on filesAndFolders completed

0 commit comments

Comments
 (0)