Skip to content

Code Quality: Avoid generation of superfluous CollectionViewSource #14629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 2, 2024
Merged

Code Quality: Avoid generation of superfluous CollectionViewSource #14629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/Files.App/Views/Layouts/BaseLayoutPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1287,28 +1287,31 @@ protected void ItemsLayout_Drop(object sender, DragEventArgs e)
CommandsViewModel?.DropCommand?.Execute(e);
}

private CollectionViewSource _CollectionViewSource;
private CollectionViewSource _GroupedCollectionViewSource;

private void UpdateCollectionViewSource()
{
if (ParentShellPageInstance is null)
return;

if (ParentShellPageInstance.FilesystemViewModel.FilesAndFolders.IsGrouped)
{
var newSource = new CollectionViewSource()
_GroupedCollectionViewSource ??= new CollectionViewSource()
{
IsSourceGrouped = true,
Source = ParentShellPageInstance.FilesystemViewModel.FilesAndFolders.GroupedCollection
IsSourceGrouped = true
};
CollectionViewSource = newSource;
_GroupedCollectionViewSource.Source = ParentShellPageInstance.FilesystemViewModel.FilesAndFolders.GroupedCollection;
CollectionViewSource = _GroupedCollectionViewSource;
}
else
{
var newSource = new CollectionViewSource()
_CollectionViewSource ??= new CollectionViewSource()
{
IsSourceGrouped = false,
Source = ParentShellPageInstance.FilesystemViewModel.FilesAndFolders
};
CollectionViewSource = newSource;
CollectionViewSource = _CollectionViewSource;
}
}

Expand Down