Skip to content

Fix: Fixed an issue where sorting preferences didn't save when changed in the columns layout #16302

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 2 commits into from
Oct 6, 2024
Merged

Fix: Fixed an issue where sorting preferences didn't save when changed in the columns layout #16302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b6a047
Fix sorting in Columns Layout
hishitetsu Oct 4, 2024
98951e1
Comment
hishitetsu Oct 4, 2024
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
8 changes: 7 additions & 1 deletion src/Files.App/Views/Shells/BaseShellPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,8 +699,14 @@ protected void FilesystemViewModel_ItemLoadStatusChanged(object sender, ItemLoad
}
}

protected virtual void FolderSettings_LayoutPreferencesUpdateRequired(object sender, LayoutPreferenceEventArgs e)
private void FolderSettings_LayoutPreferencesUpdateRequired(object sender, LayoutPreferenceEventArgs e)
{
if (ShellViewModel is null)
return;

LayoutPreferencesManager.SetLayoutPreferencesForPath(ShellViewModel.WorkingDirectory, e.LayoutPreference);
if (e.IsAdaptiveLayoutUpdateRequired)
AdaptiveLayoutHelpers.ApplyAdaptativeLayout(InstanceViewModel.FolderSettings, ShellViewModel.FilesAndFolders.ToList());
}

protected virtual void ViewModel_WorkingDirectoryModified(object sender, WorkingDirectoryModifiedEventArgs e)
Expand Down
24 changes: 4 additions & 20 deletions src/Files.App/Views/Shells/ColumnShellPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ protected override void ShellPage_NavigationRequested(object sender, PathNavigat

protected override void OnNavigationParamsChanged()
{
if (ColumnParams.NavPathParam is not null)
// This method call is required to load the sorting preferences.
InstanceViewModel.FolderSettings.GetLayoutType(ColumnParams.NavPathParam);

ItemDisplayFrame.Navigate(
typeof(ColumnLayoutPage),
new NavigationArguments()
Expand Down Expand Up @@ -183,25 +187,5 @@ public override void NavigateHome()

public override Task WhenIsCurrent()
=> Task.WhenAll(_IsCurrentInstanceTCS.Task, this.FindAscendant<ColumnsLayoutPage>()?.ParentShellPageInstance?.WhenIsCurrent() ?? Task.CompletedTask);

public void RemoveLastPageFromBackStack()
{
ItemDisplayFrame.BackStack.Remove(ItemDisplayFrame.BackStack.Last());
}

public void SubmitSearch(string query)
{
ShellViewModel.CancelSearch();
InstanceViewModel.CurrentSearchQuery = query;
ItemDisplayFrame.Navigate(typeof(ColumnLayoutPage), new NavigationArguments()
{
AssociatedTabInstance = this,
IsSearchResultPage = true,
SearchPathParam = ShellViewModel.WorkingDirectory,
SearchQuery = query,
});

//this.FindAscendant<ColumnViewBrowser>().SetSelectedPathOrNavigate(null, typeof(ColumnViewBase), navArgs);
}
}
}
10 changes: 0 additions & 10 deletions src/Files.App/Views/Shells/ModernShellPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,6 @@ private void ModernShellPage_RefreshWidgetsRequested(object sender, EventArgs e)
currentPage.ViewModel.RefreshWidgetList();
}

protected override void FolderSettings_LayoutPreferencesUpdateRequired(object sender, LayoutPreferenceEventArgs e)
{
if (ShellViewModel is null)
return;

LayoutPreferencesManager.SetLayoutPreferencesForPath(ShellViewModel.WorkingDirectory, e.LayoutPreference);
if (e.IsAdaptiveLayoutUpdateRequired)
AdaptiveLayoutHelpers.ApplyAdaptativeLayout(InstanceViewModel.FolderSettings, ShellViewModel.FilesAndFolders.ToList());
}

protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
{
base.OnNavigatedTo(eventArgs);
Expand Down