Skip to content

Fix: Fixed issue where items could not be sorted by clicking on the header of the details layout #15128

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
yaira2 merged 1 commit into from
Apr 7, 2024
Merged

Fix: Fixed issue where items could not be sorted by clicking on the header of the details layout #15128

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
30 changes: 15 additions & 15 deletions src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,21 @@ public DetailsLayoutPage() : base()
DataContext = this;
var selectionRectangle = RectangleSelection.Create(FileList, SelectionRectangle, FileList_SelectionChanged);
selectionRectangle.SelectionEnded += SelectionRectangle_SelectionEnded;

UpdateSortOptionsCommand = new RelayCommand<string>(x =>
{
if (!Enum.TryParse<SortOption>(x, out var val))
return;
if (FolderSettings.DirectorySortOption == val)
{
FolderSettings.DirectorySortDirection = (SortDirection)(((int)FolderSettings.DirectorySortDirection + 1) % 2);
}
else
{
FolderSettings.DirectorySortOption = val;
FolderSettings.DirectorySortDirection = SortDirection.Ascending;
}
});
}

// Methods
Expand Down Expand Up @@ -150,21 +165,6 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
if (parameters.IsLayoutSwitch)
_ = ReloadItemIconsAsync();

UpdateSortOptionsCommand = new RelayCommand<string>(x =>
{
if (!Enum.TryParse<SortOption>(x, out var val))
return;
if (FolderSettings.DirectorySortOption == val)
{
FolderSettings.DirectorySortDirection = (SortDirection)(((int)FolderSettings.DirectorySortDirection + 1) % 2);
}
else
{
FolderSettings.DirectorySortOption = val;
FolderSettings.DirectorySortDirection = SortDirection.Ascending;
}
});

FilesystemViewModel_PageTypeUpdated(null, new PageTypeUpdatedEventArgs()
{
IsTypeCloudDrive = InstanceViewModel?.IsPageTypeCloudDrive ?? false,
Expand Down