From 50bc63bc0c711e23a06e502a0d3e5ec52a07e852 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Fri, 6 Dec 2024 08:55:10 +0100 Subject: [PATCH 01/20] Fix: Keep sort and group options consistent between tabs --- .../Data/Contracts/IShellPanesPage.cs | 5 +++++ .../Layout/LayoutPreferencesManager.cs | 16 ++++++++++++++ src/Files.App/Views/MainPage.xaml.cs | 2 ++ src/Files.App/Views/ShellPanesPage.xaml.cs | 21 +++++++++++++++++++ 4 files changed, 44 insertions(+) diff --git a/src/Files.App/Data/Contracts/IShellPanesPage.cs b/src/Files.App/Data/Contracts/IShellPanesPage.cs index fd62a301e38b..f576fc780787 100644 --- a/src/Files.App/Data/Contracts/IShellPanesPage.cs +++ b/src/Files.App/Data/Contracts/IShellPanesPage.cs @@ -58,5 +58,10 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged /// Focuses the other pane. /// public void FocusOtherPane(); + + /// + /// Updates the layout of open panes. + /// + public void UpdatePanesLayout(); } } diff --git a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs index b4b8742220dc..cd285115c41f 100644 --- a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs +++ b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs @@ -265,6 +265,22 @@ public Type GetLayoutType(string path, bool changeLayoutMode = true) }; } + public void UpdateGroupAndSortOptions(string? path) + { + if (string.IsNullOrWhiteSpace(path)) + return; + + var preferencesItem = GetLayoutPreferencesForPath(path); + if (preferencesItem is null) + return; + + DirectorySortOption = preferencesItem.DirectorySortOption; + DirectorySortDirection = preferencesItem.DirectorySortDirection; + DirectoryGroupOption = preferencesItem.DirectoryGroupOption; + DirectoryGroupByDateUnit = preferencesItem.DirectoryGroupByDateUnit; + DirectoryGroupDirection = preferencesItem.DirectoryGroupDirection; + } + public bool IsPathUsingDefaultLayout(string? path) { return UserSettingsService.LayoutSettingsService.SyncFolderPreferencesAcrossDirectories || diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs index 81d6f68c4d7b..23cf0e417bf1 100644 --- a/src/Files.App/Views/MainPage.xaml.cs +++ b/src/Files.App/Views/MainPage.xaml.cs @@ -170,6 +170,8 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur { SidebarAdaptiveViewModel.PaneHolder = currentInstance; SidebarAdaptiveViewModel.PaneHolder.PropertyChanged += PaneHolder_PropertyChanged; + // Issue doesn't update the secondary pane in general + currentInstance.UpdatePanesLayout(); } SidebarAdaptiveViewModel.NotifyInstanceRelatedPropertiesChanged((navArgs as PaneNavigationArguments)?.LeftPaneNavPathParam); diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index 05df40ffa980..edb3b01a15d6 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -185,7 +185,10 @@ public IShellPage? ActivePane secondShellPage.IsCurrentInstance = false; if (ActivePane is not null) + { ActivePane.IsCurrentInstance = IsCurrentInstance; + UpdatePaneLayout(ActivePane); + } NotifyPropertyChanged(nameof(ActivePane)); NotifyPropertyChanged(nameof(IsLeftPaneActive)); @@ -356,6 +359,17 @@ public void FocusOtherPane() GetPane(0)?.Focus(FocusState.Programmatic); } + /// + public void UpdatePanesLayout() + { + if (GetPane(0) is IShellPage leftPane) + UpdatePaneLayout(leftPane); + + + if (GetPane(1) is IShellPage rightPane) + UpdatePaneLayout(rightPane); + } + // Private methods private ModernShellPage? GetPane(int index = -1) @@ -603,6 +617,13 @@ paneArgs.ShellPaneArrangement is ShellPaneArrangement.None }; } + private void UpdatePaneLayout(IShellPage pane) + { + var page = pane.SlimContentPage as BaseLayoutPage; + var path = pane.ShellViewModel.CurrentFolder?.ItemPath; + page?.FolderSettings?.UpdateGroupAndSortOptions(path); + } + // Event methods public Task TabItemDragOver(object sender, DragEventArgs e) From 8db6cbe5fa8e2de326ec09f0dbbce1526cb282cb Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Fri, 6 Dec 2024 18:02:16 +0100 Subject: [PATCH 02/20] Remove outdated comment --- src/Files.App/Views/MainPage.xaml.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs index 23cf0e417bf1..0b03ceedb256 100644 --- a/src/Files.App/Views/MainPage.xaml.cs +++ b/src/Files.App/Views/MainPage.xaml.cs @@ -170,7 +170,6 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur { SidebarAdaptiveViewModel.PaneHolder = currentInstance; SidebarAdaptiveViewModel.PaneHolder.PropertyChanged += PaneHolder_PropertyChanged; - // Issue doesn't update the secondary pane in general currentInstance.UpdatePanesLayout(); } SidebarAdaptiveViewModel.NotifyInstanceRelatedPropertiesChanged((navArgs as PaneNavigationArguments)?.LeftPaneNavPathParam); From 1e07cf3caeba6e51efd3b26eeeb4b2c8166124f0 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Fri, 13 Dec 2024 17:03:59 +0100 Subject: [PATCH 03/20] Refresh both panes --- src/Files.App/Data/Contracts/IShellPanesPage.cs | 2 +- src/Files.App/Views/ShellPanesPage.xaml.cs | 8 +++----- src/Files.App/Views/Shells/BaseShellPage.cs | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Files.App/Data/Contracts/IShellPanesPage.cs b/src/Files.App/Data/Contracts/IShellPanesPage.cs index f576fc780787..edd26225fae4 100644 --- a/src/Files.App/Data/Contracts/IShellPanesPage.cs +++ b/src/Files.App/Data/Contracts/IShellPanesPage.cs @@ -62,6 +62,6 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged /// /// Updates the layout of open panes. /// - public void UpdatePanesLayout(); + public void UpdatePanesLayout(bool inlcudeActive = true); } } diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index edb3b01a15d6..7a71ddfef1b8 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -187,7 +187,6 @@ public IShellPage? ActivePane if (ActivePane is not null) { ActivePane.IsCurrentInstance = IsCurrentInstance; - UpdatePaneLayout(ActivePane); } NotifyPropertyChanged(nameof(ActivePane)); @@ -360,13 +359,12 @@ public void FocusOtherPane() } /// - public void UpdatePanesLayout() + public void UpdatePanesLayout(bool inlcudeActive = true) { - if (GetPane(0) is IShellPage leftPane) + if (GetPane(0) is IShellPage leftPane && (inlcudeActive || leftPane != ActivePane)) UpdatePaneLayout(leftPane); - - if (GetPane(1) is IShellPage rightPane) + if (GetPane(1) is IShellPage rightPane && (inlcudeActive || rightPane != ActivePane)) UpdatePaneLayout(rightPane); } diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs index 3c9e57ffd48d..074cbcda3224 100644 --- a/src/Files.App/Views/Shells/BaseShellPage.cs +++ b/src/Files.App/Views/Shells/BaseShellPage.cs @@ -707,6 +707,8 @@ private void FolderSettings_LayoutPreferencesUpdateRequired(object sender, Layou LayoutPreferencesManager.SetLayoutPreferencesForPath(ShellViewModel.WorkingDirectory, e.LayoutPreference); if (e.IsAdaptiveLayoutUpdateRequired) AdaptiveLayoutHelpers.ApplyAdaptativeLayout(InstanceViewModel.FolderSettings, ShellViewModel.FilesAndFolders.ToList()); + + _PaneHolder.UpdatePanesLayout(false); } protected virtual void ViewModel_WorkingDirectoryModified(object sender, WorkingDirectoryModifiedEventArgs e) From 520057bb14dd0caf97e767a665e796cedb9f2527 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Fri, 13 Dec 2024 19:09:04 +0100 Subject: [PATCH 04/20] Update src/Files.App/Views/ShellPanesPage.xaml.cs Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> --- src/Files.App/Views/ShellPanesPage.xaml.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index 7a71ddfef1b8..33693a6a9696 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -185,9 +185,7 @@ public IShellPage? ActivePane secondShellPage.IsCurrentInstance = false; if (ActivePane is not null) - { ActivePane.IsCurrentInstance = IsCurrentInstance; - } NotifyPropertyChanged(nameof(ActivePane)); NotifyPropertyChanged(nameof(IsLeftPaneActive)); From 2c33a8117fd800edb1cc1974e29d124ee133cd58 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Sun, 15 Dec 2024 21:33:05 +0100 Subject: [PATCH 05/20] Requested changes --- .../Data/Contracts/IShellPanesPage.cs | 2 +- src/Files.App/Views/ShellPanesPage.xaml.cs | 45 ++++++++++++++++--- src/Files.App/Views/Shells/BaseShellPage.cs | 2 - 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/Files.App/Data/Contracts/IShellPanesPage.cs b/src/Files.App/Data/Contracts/IShellPanesPage.cs index edd26225fae4..f576fc780787 100644 --- a/src/Files.App/Data/Contracts/IShellPanesPage.cs +++ b/src/Files.App/Data/Contracts/IShellPanesPage.cs @@ -62,6 +62,6 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged /// /// Updates the layout of open panes. /// - public void UpdatePanesLayout(bool inlcudeActive = true); + public void UpdatePanesLayout(); } } diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index 33693a6a9696..cf044f8ecf15 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -19,6 +19,7 @@ public sealed partial class ShellPanesPage : Page, IShellPanesPage, ITabBarItemC // Dependency injections private IGeneralSettingsService GeneralSettingsService { get; } = Ioc.Default.GetRequiredService(); + private ILayoutSettingsService LayoutSettingsService { get; } = Ioc.Default.GetRequiredService(); private AppModel AppModel { get; } = Ioc.Default.GetRequiredService(); // Constants @@ -357,13 +358,10 @@ public void FocusOtherPane() } /// - public void UpdatePanesLayout(bool inlcudeActive = true) + public void UpdatePanesLayout() { - if (GetPane(0) is IShellPage leftPane && (inlcudeActive || leftPane != ActivePane)) - UpdatePaneLayout(leftPane); - - if (GetPane(1) is IShellPage rightPane && (inlcudeActive || rightPane != ActivePane)) - UpdatePaneLayout(rightPane); + foreach (var pane in GetPanes()) + UpdatePaneLayout(pane); } // Private methods @@ -469,6 +467,9 @@ RootGrid.ColumnDefinitions.Count is 0 // Focus ActivePane = GetPane(GetPaneCount() - 1); + UnHookLayoutUpdateRequiredEvent(); + HookLayoutUpdateRequiredEvent(); + NotifyPropertyChanged(nameof(IsMultiPaneActive)); } @@ -533,6 +534,7 @@ private void RemovePane(int index = -1) } Pane_ContentChanged(null, null!); + UnHookLayoutUpdateRequiredEvent(); NotifyPropertyChanged(nameof(IsMultiPaneActive)); } @@ -562,6 +564,18 @@ private void SetShadow() } } + private void HookLayoutUpdateRequiredEvent() + { + foreach (var pane in GetPanes()) + pane.FolderSettings.LayoutPreferencesUpdateRequired += FolderSettings_LayoutPreferencesUpdateRequired; + } + + private void UnHookLayoutUpdateRequiredEvent() + { + foreach (var pane in GetPanes()) + pane.FolderSettings.LayoutPreferencesUpdateRequired -= FolderSettings_LayoutPreferencesUpdateRequired; + } + // Override methods protected override void OnNavigatedTo(NavigationEventArgs eventArgs) @@ -740,6 +754,24 @@ private void Sizer_ManipulationCompleted(object sender, ManipulationCompletedRou this.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow)); } + private void FolderSettings_LayoutPreferencesUpdateRequired(object? sender, LayoutPreferenceEventArgs e) + { + var currentPath = ActivePane?.TabBarItemParameter?.NavigationParameter as string; + if (string.IsNullOrEmpty(currentPath)) + return; + + foreach (var pane in GetPanes()) + { + if (pane != ActivePane && + (LayoutSettingsService.SyncFolderPreferencesAcrossDirectories || + pane.TabBarItemParameter?.NavigationParameter is string path && + path.Equals(currentPath, StringComparison.OrdinalIgnoreCase))) + { + UpdatePaneLayout(pane); + } + } + } + private void NotifyPropertyChanged([CallerMemberName] string propertyName = "") { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); @@ -759,6 +791,7 @@ public void Dispose() pane.GotFocus -= Pane_GotFocus; pane.RightTapped -= Pane_RightTapped; pane.PointerPressed -= Pane_PointerPressed; + pane.FolderSettings.LayoutPreferencesUpdateRequired -= FolderSettings_LayoutPreferencesUpdateRequired; pane.Dispose(); } diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs index 074cbcda3224..3c9e57ffd48d 100644 --- a/src/Files.App/Views/Shells/BaseShellPage.cs +++ b/src/Files.App/Views/Shells/BaseShellPage.cs @@ -707,8 +707,6 @@ private void FolderSettings_LayoutPreferencesUpdateRequired(object sender, Layou LayoutPreferencesManager.SetLayoutPreferencesForPath(ShellViewModel.WorkingDirectory, e.LayoutPreference); if (e.IsAdaptiveLayoutUpdateRequired) AdaptiveLayoutHelpers.ApplyAdaptativeLayout(InstanceViewModel.FolderSettings, ShellViewModel.FilesAndFolders.ToList()); - - _PaneHolder.UpdatePanesLayout(false); } protected virtual void ViewModel_WorkingDirectoryModified(object sender, WorkingDirectoryModifiedEventArgs e) From 589535816daf2f63717314daead66e898cfb07f3 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Fri, 6 Dec 2024 08:55:10 +0100 Subject: [PATCH 06/20] Fix: Keep sort and group options consistent between tabs --- .../Data/Contracts/IShellPanesPage.cs | 5 +++++ .../Layout/LayoutPreferencesManager.cs | 16 ++++++++++++++ src/Files.App/Views/MainPage.xaml.cs | 2 ++ src/Files.App/Views/ShellPanesPage.xaml.cs | 21 +++++++++++++++++++ 4 files changed, 44 insertions(+) diff --git a/src/Files.App/Data/Contracts/IShellPanesPage.cs b/src/Files.App/Data/Contracts/IShellPanesPage.cs index 9eb40f0971fc..5b5730be3055 100644 --- a/src/Files.App/Data/Contracts/IShellPanesPage.cs +++ b/src/Files.App/Data/Contracts/IShellPanesPage.cs @@ -58,5 +58,10 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged /// Focuses the other pane. /// public void FocusOtherPane(); + + /// + /// Updates the layout of open panes. + /// + public void UpdatePanesLayout(); } } diff --git a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs index 7f17895d5c85..3fde30d9ad09 100644 --- a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs +++ b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs @@ -265,6 +265,22 @@ public Type GetLayoutType(string path, bool changeLayoutMode = true) }; } + public void UpdateGroupAndSortOptions(string? path) + { + if (string.IsNullOrWhiteSpace(path)) + return; + + var preferencesItem = GetLayoutPreferencesForPath(path); + if (preferencesItem is null) + return; + + DirectorySortOption = preferencesItem.DirectorySortOption; + DirectorySortDirection = preferencesItem.DirectorySortDirection; + DirectoryGroupOption = preferencesItem.DirectoryGroupOption; + DirectoryGroupByDateUnit = preferencesItem.DirectoryGroupByDateUnit; + DirectoryGroupDirection = preferencesItem.DirectoryGroupDirection; + } + public bool IsPathUsingDefaultLayout(string? path) { return UserSettingsService.LayoutSettingsService.SyncFolderPreferencesAcrossDirectories || diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs index 1c14c97dce2f..fc64b9942d73 100644 --- a/src/Files.App/Views/MainPage.xaml.cs +++ b/src/Files.App/Views/MainPage.xaml.cs @@ -171,6 +171,8 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur { SidebarAdaptiveViewModel.PaneHolder = currentInstance; SidebarAdaptiveViewModel.PaneHolder.PropertyChanged += PaneHolder_PropertyChanged; + // Issue doesn't update the secondary pane in general + currentInstance.UpdatePanesLayout(); } SidebarAdaptiveViewModel.NotifyInstanceRelatedPropertiesChanged((navArgs as PaneNavigationArguments)?.LeftPaneNavPathParam); diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index 7298d6d1c5ad..63338cf213f9 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -185,7 +185,10 @@ public IShellPage? ActivePane secondShellPage.IsCurrentInstance = false; if (ActivePane is not null) + { ActivePane.IsCurrentInstance = IsCurrentInstance; + UpdatePaneLayout(ActivePane); + } NotifyPropertyChanged(nameof(ActivePane)); NotifyPropertyChanged(nameof(IsLeftPaneActive)); @@ -356,6 +359,17 @@ public void FocusOtherPane() GetPane(0)?.Focus(FocusState.Programmatic); } + /// + public void UpdatePanesLayout() + { + if (GetPane(0) is IShellPage leftPane) + UpdatePaneLayout(leftPane); + + + if (GetPane(1) is IShellPage rightPane) + UpdatePaneLayout(rightPane); + } + // Private methods private ModernShellPage? GetPane(int index = -1) @@ -603,6 +617,13 @@ paneArgs.ShellPaneArrangement is ShellPaneArrangement.None }; } + private void UpdatePaneLayout(IShellPage pane) + { + var page = pane.SlimContentPage as BaseLayoutPage; + var path = pane.ShellViewModel.CurrentFolder?.ItemPath; + page?.FolderSettings?.UpdateGroupAndSortOptions(path); + } + // Event methods public Task TabItemDragOver(object sender, DragEventArgs e) From 931884229e16a10d58fd79920a10cb79005517bd Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Fri, 6 Dec 2024 18:02:16 +0100 Subject: [PATCH 07/20] Remove outdated comment --- src/Files.App/Views/MainPage.xaml.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs index fc64b9942d73..6f7bd95a3348 100644 --- a/src/Files.App/Views/MainPage.xaml.cs +++ b/src/Files.App/Views/MainPage.xaml.cs @@ -171,7 +171,6 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur { SidebarAdaptiveViewModel.PaneHolder = currentInstance; SidebarAdaptiveViewModel.PaneHolder.PropertyChanged += PaneHolder_PropertyChanged; - // Issue doesn't update the secondary pane in general currentInstance.UpdatePanesLayout(); } SidebarAdaptiveViewModel.NotifyInstanceRelatedPropertiesChanged((navArgs as PaneNavigationArguments)?.LeftPaneNavPathParam); From 3b16134541d352a594243db7e58637cd861f34ba Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Fri, 13 Dec 2024 17:03:59 +0100 Subject: [PATCH 08/20] Refresh both panes --- src/Files.App/Data/Contracts/IShellPanesPage.cs | 2 +- src/Files.App/Views/ShellPanesPage.xaml.cs | 8 +++----- src/Files.App/Views/Shells/BaseShellPage.cs | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Files.App/Data/Contracts/IShellPanesPage.cs b/src/Files.App/Data/Contracts/IShellPanesPage.cs index 5b5730be3055..f6b068ffe883 100644 --- a/src/Files.App/Data/Contracts/IShellPanesPage.cs +++ b/src/Files.App/Data/Contracts/IShellPanesPage.cs @@ -62,6 +62,6 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged /// /// Updates the layout of open panes. /// - public void UpdatePanesLayout(); + public void UpdatePanesLayout(bool inlcudeActive = true); } } diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index 63338cf213f9..251f35419d9c 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -187,7 +187,6 @@ public IShellPage? ActivePane if (ActivePane is not null) { ActivePane.IsCurrentInstance = IsCurrentInstance; - UpdatePaneLayout(ActivePane); } NotifyPropertyChanged(nameof(ActivePane)); @@ -360,13 +359,12 @@ public void FocusOtherPane() } /// - public void UpdatePanesLayout() + public void UpdatePanesLayout(bool inlcudeActive = true) { - if (GetPane(0) is IShellPage leftPane) + if (GetPane(0) is IShellPage leftPane && (inlcudeActive || leftPane != ActivePane)) UpdatePaneLayout(leftPane); - - if (GetPane(1) is IShellPage rightPane) + if (GetPane(1) is IShellPage rightPane && (inlcudeActive || rightPane != ActivePane)) UpdatePaneLayout(rightPane); } diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs index 305c8d211aa4..64fa8d472d08 100644 --- a/src/Files.App/Views/Shells/BaseShellPage.cs +++ b/src/Files.App/Views/Shells/BaseShellPage.cs @@ -707,6 +707,8 @@ private void FolderSettings_LayoutPreferencesUpdateRequired(object sender, Layou LayoutPreferencesManager.SetLayoutPreferencesForPath(ShellViewModel.WorkingDirectory, e.LayoutPreference); if (e.IsAdaptiveLayoutUpdateRequired) AdaptiveLayoutHelpers.ApplyAdaptativeLayout(InstanceViewModel.FolderSettings, ShellViewModel.FilesAndFolders.ToList()); + + _PaneHolder.UpdatePanesLayout(false); } protected virtual void ViewModel_WorkingDirectoryModified(object sender, WorkingDirectoryModifiedEventArgs e) From 1d58ad9c8d8adc74cb98de55363699890023ba1e Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Fri, 13 Dec 2024 19:09:04 +0100 Subject: [PATCH 09/20] Update src/Files.App/Views/ShellPanesPage.xaml.cs Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> --- src/Files.App/Views/ShellPanesPage.xaml.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index 251f35419d9c..cce04ae03630 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -185,9 +185,7 @@ public IShellPage? ActivePane secondShellPage.IsCurrentInstance = false; if (ActivePane is not null) - { ActivePane.IsCurrentInstance = IsCurrentInstance; - } NotifyPropertyChanged(nameof(ActivePane)); NotifyPropertyChanged(nameof(IsLeftPaneActive)); From ee8a6ad1727c92d4a2fcee04f919a8cdecf401f3 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Sun, 15 Dec 2024 21:33:05 +0100 Subject: [PATCH 10/20] Requested changes --- .../Data/Contracts/IShellPanesPage.cs | 2 +- src/Files.App/Views/ShellPanesPage.xaml.cs | 45 ++++++++++++++++--- src/Files.App/Views/Shells/BaseShellPage.cs | 2 - 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/Files.App/Data/Contracts/IShellPanesPage.cs b/src/Files.App/Data/Contracts/IShellPanesPage.cs index f6b068ffe883..5b5730be3055 100644 --- a/src/Files.App/Data/Contracts/IShellPanesPage.cs +++ b/src/Files.App/Data/Contracts/IShellPanesPage.cs @@ -62,6 +62,6 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged /// /// Updates the layout of open panes. /// - public void UpdatePanesLayout(bool inlcudeActive = true); + public void UpdatePanesLayout(); } } diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index cce04ae03630..6754f738b8d1 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -19,6 +19,7 @@ public sealed partial class ShellPanesPage : Page, IShellPanesPage, ITabBarItemC // Dependency injections private IGeneralSettingsService GeneralSettingsService { get; } = Ioc.Default.GetRequiredService(); + private ILayoutSettingsService LayoutSettingsService { get; } = Ioc.Default.GetRequiredService(); private AppModel AppModel { get; } = Ioc.Default.GetRequiredService(); // Constants @@ -357,13 +358,10 @@ public void FocusOtherPane() } /// - public void UpdatePanesLayout(bool inlcudeActive = true) + public void UpdatePanesLayout() { - if (GetPane(0) is IShellPage leftPane && (inlcudeActive || leftPane != ActivePane)) - UpdatePaneLayout(leftPane); - - if (GetPane(1) is IShellPage rightPane && (inlcudeActive || rightPane != ActivePane)) - UpdatePaneLayout(rightPane); + foreach (var pane in GetPanes()) + UpdatePaneLayout(pane); } // Private methods @@ -469,6 +467,9 @@ RootGrid.ColumnDefinitions.Count is 0 // Focus ActivePane = GetPane(GetPaneCount() - 1); + UnHookLayoutUpdateRequiredEvent(); + HookLayoutUpdateRequiredEvent(); + NotifyPropertyChanged(nameof(IsMultiPaneActive)); } @@ -533,6 +534,7 @@ private void RemovePane(int index = -1) } Pane_ContentChanged(null, null!); + UnHookLayoutUpdateRequiredEvent(); NotifyPropertyChanged(nameof(IsMultiPaneActive)); } @@ -562,6 +564,18 @@ private void SetShadow() } } + private void HookLayoutUpdateRequiredEvent() + { + foreach (var pane in GetPanes()) + pane.FolderSettings.LayoutPreferencesUpdateRequired += FolderSettings_LayoutPreferencesUpdateRequired; + } + + private void UnHookLayoutUpdateRequiredEvent() + { + foreach (var pane in GetPanes()) + pane.FolderSettings.LayoutPreferencesUpdateRequired -= FolderSettings_LayoutPreferencesUpdateRequired; + } + // Override methods protected override void OnNavigatedTo(NavigationEventArgs eventArgs) @@ -741,6 +755,24 @@ private void Sizer_ManipulationCompleted(object sender, ManipulationCompletedRou this.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow)); } + private void FolderSettings_LayoutPreferencesUpdateRequired(object? sender, LayoutPreferenceEventArgs e) + { + var currentPath = ActivePane?.TabBarItemParameter?.NavigationParameter as string; + if (string.IsNullOrEmpty(currentPath)) + return; + + foreach (var pane in GetPanes()) + { + if (pane != ActivePane && + (LayoutSettingsService.SyncFolderPreferencesAcrossDirectories || + pane.TabBarItemParameter?.NavigationParameter is string path && + path.Equals(currentPath, StringComparison.OrdinalIgnoreCase))) + { + UpdatePaneLayout(pane); + } + } + } + private void NotifyPropertyChanged([CallerMemberName] string propertyName = "") { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); @@ -760,6 +792,7 @@ public void Dispose() pane.GotFocus -= Pane_GotFocus; pane.RightTapped -= Pane_RightTapped; pane.PointerPressed -= Pane_PointerPressed; + pane.FolderSettings.LayoutPreferencesUpdateRequired -= FolderSettings_LayoutPreferencesUpdateRequired; pane.Dispose(); } diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs index 64fa8d472d08..305c8d211aa4 100644 --- a/src/Files.App/Views/Shells/BaseShellPage.cs +++ b/src/Files.App/Views/Shells/BaseShellPage.cs @@ -707,8 +707,6 @@ private void FolderSettings_LayoutPreferencesUpdateRequired(object sender, Layou LayoutPreferencesManager.SetLayoutPreferencesForPath(ShellViewModel.WorkingDirectory, e.LayoutPreference); if (e.IsAdaptiveLayoutUpdateRequired) AdaptiveLayoutHelpers.ApplyAdaptativeLayout(InstanceViewModel.FolderSettings, ShellViewModel.FilesAndFolders.ToList()); - - _PaneHolder.UpdatePanesLayout(false); } protected virtual void ViewModel_WorkingDirectoryModified(object sender, WorkingDirectoryModifiedEventArgs e) From b3ad7c53f91e09904ef53bf70449e1eaa1b2337d Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Wed, 22 Jan 2025 13:45:11 +0100 Subject: [PATCH 11/20] Required changes --- src/Files.App/Actions/Display/GroupAction.cs | 7 +++ src/Files.App/Actions/Display/SortAction.cs | 5 ++ .../SortFilesAndFoldersTogetherAction.cs | 1 + .../Actions/Display/SortFilesFirstAction.cs | 1 + .../Actions/Display/SortFoldersFirstAction.cs | 1 + .../DisplayPage/DisplayPageContext.cs | 14 +++++ .../DisplayPage/IDisplayPageContext.cs | 2 + .../Data/Contracts/IShellPanesPage.cs | 4 +- .../Layout/LayoutPreferencesManager.cs | 2 + src/Files.App/Views/MainPage.xaml.cs | 1 - src/Files.App/Views/ShellPanesPage.xaml.cs | 56 ++++--------------- 11 files changed, 48 insertions(+), 46 deletions(-) diff --git a/src/Files.App/Actions/Display/GroupAction.cs b/src/Files.App/Actions/Display/GroupAction.cs index e0bf7d3e1930..b37f5188074e 100644 --- a/src/Files.App/Actions/Display/GroupAction.cs +++ b/src/Files.App/Actions/Display/GroupAction.cs @@ -177,6 +177,7 @@ public GroupByAction() public Task ExecuteAsync(object? parameter = null) { DisplayContext.GroupOption = GroupOption; + DisplayContext.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } @@ -425,6 +426,7 @@ public GroupAscendingAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = SortDirection.Ascending; + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } @@ -469,6 +471,7 @@ public GroupDescendingAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = SortDirection.Descending; + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } @@ -505,6 +508,7 @@ public ToggleGroupDirectionAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = context.SortDirection is SortDirection.Descending ? SortDirection.Ascending : SortDirection.Descending; + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } @@ -536,6 +540,7 @@ public GroupByYearAction() public Task ExecuteAsync(object? parameter = null) { context.GroupByDateUnit = GroupByDateUnit.Year; + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } @@ -580,6 +585,7 @@ public GroupByMonthAction() public Task ExecuteAsync(object? parameter = null) { context.GroupByDateUnit = GroupByDateUnit.Month; + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } @@ -621,6 +627,7 @@ public Task ExecuteAsync(object? parameter = null) GroupByDateUnit.Month => GroupByDateUnit.Day, _ => GroupByDateUnit.Year }; + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortAction.cs b/src/Files.App/Actions/Display/SortAction.cs index 4c5b9742259e..4aecf7f9d086 100644 --- a/src/Files.App/Actions/Display/SortAction.cs +++ b/src/Files.App/Actions/Display/SortAction.cs @@ -165,6 +165,7 @@ public SortByAction() public Task ExecuteAsync(object? parameter = null) { displayContext.SortOption = SortOption; + displayContext.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } @@ -207,6 +208,7 @@ public SortAscendingAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirection = SortDirection.Ascending; + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } @@ -241,6 +243,7 @@ public SortDescendingAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirection = SortDirection.Descending; + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } @@ -273,6 +276,8 @@ public Task ExecuteAsync(object? parameter = null) context.SortDirection is SortDirection.Descending ? SortDirection.Ascending : SortDirection.Descending; + + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs b/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs index e91ea79c8bc4..5c183b8749dc 100644 --- a/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs +++ b/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs @@ -26,6 +26,7 @@ public SortFilesAndFoldersTogetherAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirectoriesAlongsideFiles = true; + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFilesFirstAction.cs b/src/Files.App/Actions/Display/SortFilesFirstAction.cs index 8db1fc77c1fd..84e341759d56 100644 --- a/src/Files.App/Actions/Display/SortFilesFirstAction.cs +++ b/src/Files.App/Actions/Display/SortFilesFirstAction.cs @@ -27,6 +27,7 @@ public Task ExecuteAsync(object? parameter = null) { context.SortFilesFirst = true; context.SortDirectoriesAlongsideFiles = false; + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFoldersFirstAction.cs b/src/Files.App/Actions/Display/SortFoldersFirstAction.cs index d1aaaaf587c1..c662704bea97 100644 --- a/src/Files.App/Actions/Display/SortFoldersFirstAction.cs +++ b/src/Files.App/Actions/Display/SortFoldersFirstAction.cs @@ -27,6 +27,7 @@ public Task ExecuteAsync(object? parameter = null) { context.SortFilesFirst = false; context.SortDirectoriesAlongsideFiles = false; + context.UpdateAllTabsAndPanesLayout(); return Task.CompletedTask; } diff --git a/src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs b/src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs index 7004f0f0742e..09e6bb0bcd34 100644 --- a/src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs +++ b/src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs @@ -131,6 +131,20 @@ public DisplayPageContext() layoutSettingsService.PropertyChanged += Settings_PropertyChanged; } + public void UpdateAllTabsAndPanesLayout() + { + var multitaskingContext = Ioc.Default.GetRequiredService(); + var tabs = multitaskingContext.Control?.GetAllTabInstances(); + var activePath = ((ShellPanesPage)multitaskingContext.CurrentTabItem.TabItemContent)?.ActivePane?.TabBarItemParameter?.NavigationParameter as string; + if (tabs is null || activePath is null) + return; + + for (int i = 0; i < tabs.Count; i++) + { + ((ShellPanesPage)tabs[i]).UpdatePanesLayout(activePath, i != multitaskingContext.CurrentTabIndex); + } + } + private void Context_Changing(object? sender, EventArgs e) { var viewModel = FolderSettings; diff --git a/src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs b/src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs index feb20ba06c25..ac9e1928c592 100644 --- a/src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs +++ b/src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs @@ -17,5 +17,7 @@ public interface IDisplayPageContext : INotifyPropertyChanging, INotifyPropertyC bool SortDirectoriesAlongsideFiles { get; set; } bool SortFilesFirst { get; set; } + + void UpdateAllTabsAndPanesLayout(); } } diff --git a/src/Files.App/Data/Contracts/IShellPanesPage.cs b/src/Files.App/Data/Contracts/IShellPanesPage.cs index 5b5730be3055..0216aa8a264c 100644 --- a/src/Files.App/Data/Contracts/IShellPanesPage.cs +++ b/src/Files.App/Data/Contracts/IShellPanesPage.cs @@ -62,6 +62,8 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged /// /// Updates the layout of open panes. /// - public void UpdatePanesLayout(); + /// The path of panes to update + /// Whether the active pane should be updated or not + public void UpdatePanesLayout(string targetPath, bool includeActivePane = false); } } diff --git a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs index 3fde30d9ad09..b8e159d2000d 100644 --- a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs +++ b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs @@ -279,6 +279,8 @@ public void UpdateGroupAndSortOptions(string? path) DirectoryGroupOption = preferencesItem.DirectoryGroupOption; DirectoryGroupByDateUnit = preferencesItem.DirectoryGroupByDateUnit; DirectoryGroupDirection = preferencesItem.DirectoryGroupDirection; + SortDirectoriesAlongsideFiles = preferencesItem.SortDirectoriesAlongsideFiles; + SortFilesFirst = preferencesItem.SortFilesFirst; } public bool IsPathUsingDefaultLayout(string? path) diff --git a/src/Files.App/Views/MainPage.xaml.cs b/src/Files.App/Views/MainPage.xaml.cs index 6f7bd95a3348..1c14c97dce2f 100644 --- a/src/Files.App/Views/MainPage.xaml.cs +++ b/src/Files.App/Views/MainPage.xaml.cs @@ -171,7 +171,6 @@ public async void MultitaskingControl_CurrentInstanceChanged(object? sender, Cur { SidebarAdaptiveViewModel.PaneHolder = currentInstance; SidebarAdaptiveViewModel.PaneHolder.PropertyChanged += PaneHolder_PropertyChanged; - currentInstance.UpdatePanesLayout(); } SidebarAdaptiveViewModel.NotifyInstanceRelatedPropertiesChanged((navArgs as PaneNavigationArguments)?.LeftPaneNavPathParam); diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index 6754f738b8d1..ae49996505e3 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -358,10 +358,20 @@ public void FocusOtherPane() } /// - public void UpdatePanesLayout() + public void UpdatePanesLayout(string targetPath, bool includeActivePane = false) { foreach (var pane in GetPanes()) - UpdatePaneLayout(pane); + { + var path = pane.ShellViewModel.CurrentFolder?.ItemPath; + if ((includeActivePane || pane != ActivePane) && + (LayoutSettingsService.SyncFolderPreferencesAcrossDirectories || + path is not null && + path.Equals(targetPath, StringComparison.OrdinalIgnoreCase))) + { + var page = pane.SlimContentPage as BaseLayoutPage; + page?.FolderSettings?.UpdateGroupAndSortOptions(path); + } + } } // Private methods @@ -467,9 +477,6 @@ RootGrid.ColumnDefinitions.Count is 0 // Focus ActivePane = GetPane(GetPaneCount() - 1); - UnHookLayoutUpdateRequiredEvent(); - HookLayoutUpdateRequiredEvent(); - NotifyPropertyChanged(nameof(IsMultiPaneActive)); } @@ -534,7 +541,6 @@ private void RemovePane(int index = -1) } Pane_ContentChanged(null, null!); - UnHookLayoutUpdateRequiredEvent(); NotifyPropertyChanged(nameof(IsMultiPaneActive)); } @@ -564,18 +570,6 @@ private void SetShadow() } } - private void HookLayoutUpdateRequiredEvent() - { - foreach (var pane in GetPanes()) - pane.FolderSettings.LayoutPreferencesUpdateRequired += FolderSettings_LayoutPreferencesUpdateRequired; - } - - private void UnHookLayoutUpdateRequiredEvent() - { - foreach (var pane in GetPanes()) - pane.FolderSettings.LayoutPreferencesUpdateRequired -= FolderSettings_LayoutPreferencesUpdateRequired; - } - // Override methods protected override void OnNavigatedTo(NavigationEventArgs eventArgs) @@ -627,13 +621,6 @@ paneArgs.ShellPaneArrangement is ShellPaneArrangement.None }; } - private void UpdatePaneLayout(IShellPage pane) - { - var page = pane.SlimContentPage as BaseLayoutPage; - var path = pane.ShellViewModel.CurrentFolder?.ItemPath; - page?.FolderSettings?.UpdateGroupAndSortOptions(path); - } - // Event methods public Task TabItemDragOver(object sender, DragEventArgs e) @@ -755,24 +742,6 @@ private void Sizer_ManipulationCompleted(object sender, ManipulationCompletedRou this.ChangeCursor(InputSystemCursor.Create(InputSystemCursorShape.Arrow)); } - private void FolderSettings_LayoutPreferencesUpdateRequired(object? sender, LayoutPreferenceEventArgs e) - { - var currentPath = ActivePane?.TabBarItemParameter?.NavigationParameter as string; - if (string.IsNullOrEmpty(currentPath)) - return; - - foreach (var pane in GetPanes()) - { - if (pane != ActivePane && - (LayoutSettingsService.SyncFolderPreferencesAcrossDirectories || - pane.TabBarItemParameter?.NavigationParameter is string path && - path.Equals(currentPath, StringComparison.OrdinalIgnoreCase))) - { - UpdatePaneLayout(pane); - } - } - } - private void NotifyPropertyChanged([CallerMemberName] string propertyName = "") { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); @@ -792,7 +761,6 @@ public void Dispose() pane.GotFocus -= Pane_GotFocus; pane.RightTapped -= Pane_RightTapped; pane.PointerPressed -= Pane_PointerPressed; - pane.FolderSettings.LayoutPreferencesUpdateRequired -= FolderSettings_LayoutPreferencesUpdateRequired; pane.Dispose(); } From 46f877d5a80fbc6bc515a9a31c6e3af371aef3c4 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:36:14 +0100 Subject: [PATCH 12/20] Requested Changes --- src/Files.App/Actions/Display/GroupAction.cs | 26 ++++++++++++++----- src/Files.App/Actions/Display/SortAction.cs | 14 +++++++--- .../ContentPage/ContentPageContext.cs | 14 ++++++++++ .../ContentPage/IContentPageContext.cs | 2 ++ .../DisplayPage/DisplayPageContext.cs | 14 ---------- .../DisplayPage/IDisplayPageContext.cs | 2 -- 6 files changed, 45 insertions(+), 27 deletions(-) diff --git a/src/Files.App/Actions/Display/GroupAction.cs b/src/Files.App/Actions/Display/GroupAction.cs index b37f5188074e..53e30d48ac39 100644 --- a/src/Files.App/Actions/Display/GroupAction.cs +++ b/src/Files.App/Actions/Display/GroupAction.cs @@ -177,7 +177,7 @@ public GroupByAction() public Task ExecuteAsync(object? parameter = null) { DisplayContext.GroupOption = GroupOption; - DisplayContext.UpdateAllTabsAndPanesLayout(); + ContentContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -403,6 +403,7 @@ private void DisplayContext_PropertyChanged(object? sender, PropertyChangedEvent internal sealed class GroupAscendingAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "Ascending".GetLocalizedResource(); @@ -419,6 +420,7 @@ public bool IsExecutable public GroupAscendingAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -426,7 +428,7 @@ public GroupAscendingAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = SortDirection.Ascending; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -448,6 +450,7 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class GroupDescendingAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "Descending".GetLocalizedResource(); @@ -464,6 +467,7 @@ public bool IsExecutable public GroupDescendingAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -471,7 +475,7 @@ public GroupDescendingAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = SortDirection.Descending; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -493,6 +497,7 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class ToggleGroupDirectionAction : IAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "ToggleSortDirection".GetLocalizedResource(); @@ -503,12 +508,13 @@ public string Description public ToggleGroupDirectionAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); } public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = context.SortDirection is SortDirection.Descending ? SortDirection.Ascending : SortDirection.Descending; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -517,6 +523,7 @@ public Task ExecuteAsync(object? parameter = null) internal sealed class GroupByYearAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "Year".GetLocalizedResource(); @@ -533,6 +540,7 @@ public bool IsExecutable public GroupByYearAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -540,7 +548,7 @@ public GroupByYearAction() public Task ExecuteAsync(object? parameter = null) { context.GroupByDateUnit = GroupByDateUnit.Year; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -562,6 +570,7 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class GroupByMonthAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "Month".GetLocalizedResource(); @@ -578,6 +587,7 @@ public bool IsExecutable public GroupByMonthAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -585,7 +595,7 @@ public GroupByMonthAction() public Task ExecuteAsync(object? parameter = null) { context.GroupByDateUnit = GroupByDateUnit.Month; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -607,6 +617,7 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class ToggleGroupByDateUnitAction : IAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "ToggleGroupingUnit".GetLocalizedResource(); @@ -617,6 +628,7 @@ public string Description public ToggleGroupByDateUnitAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); } public Task ExecuteAsync(object? parameter = null) @@ -627,7 +639,7 @@ public Task ExecuteAsync(object? parameter = null) GroupByDateUnit.Month => GroupByDateUnit.Day, _ => GroupByDateUnit.Year }; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortAction.cs b/src/Files.App/Actions/Display/SortAction.cs index 4aecf7f9d086..3f166da63418 100644 --- a/src/Files.App/Actions/Display/SortAction.cs +++ b/src/Files.App/Actions/Display/SortAction.cs @@ -165,7 +165,7 @@ public SortByAction() public Task ExecuteAsync(object? parameter = null) { displayContext.SortOption = SortOption; - displayContext.UpdateAllTabsAndPanesLayout(); + contentContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -188,6 +188,7 @@ private void DisplayContext_PropertyChanged(object? sender, PropertyChangedEvent internal sealed class SortAscendingAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "Ascending".GetLocalizedResource(); @@ -201,6 +202,7 @@ public bool IsOn public SortAscendingAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -208,7 +210,7 @@ public SortAscendingAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirection = SortDirection.Ascending; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -223,6 +225,7 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class SortDescendingAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "Descending".GetLocalizedResource(); @@ -236,6 +239,7 @@ public bool IsOn public SortDescendingAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -243,7 +247,7 @@ public SortDescendingAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirection = SortDirection.Descending; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -258,6 +262,7 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class ToggleSortDirectionAction : IAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "ToggleSortDirection".GetLocalizedResource(); @@ -268,6 +273,7 @@ public string Description public ToggleSortDirectionAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); } public Task ExecuteAsync(object? parameter = null) @@ -277,7 +283,7 @@ context.SortDirection is SortDirection.Descending ? SortDirection.Ascending : SortDirection.Descending; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs b/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs index ab27b91595c0..e86ffc9264a4 100644 --- a/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs +++ b/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs @@ -62,6 +62,20 @@ public ContentPageContext() Update(); } + public void UpdateOpenTabsPreferences() + { + var multitaskingContext = Ioc.Default.GetRequiredService(); + var tabs = multitaskingContext.Control?.GetAllTabInstances(); + var activePath = ((ShellPanesPage)multitaskingContext.CurrentTabItem.TabItemContent)?.ActivePane?.TabBarItemParameter?.NavigationParameter as string; + if (tabs is null || activePath is null) + return; + + for (int i = 0; i < tabs.Count; i++) + { + ((ShellPanesPage)tabs[i]).UpdatePanesLayout(activePath, i != multitaskingContext.CurrentTabIndex); + } + } + private void GitHelpers_IsExecutingGitActionChanged(object? sender, PropertyChangedEventArgs e) { OnPropertyChanged(nameof(CanExecuteGitAction)); diff --git a/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs b/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs index f4a4a5c8a9aa..00063f893d51 100644 --- a/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs +++ b/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs @@ -34,5 +34,7 @@ public interface IContentPageContext : INotifyPropertyChanged bool CanExecuteGitAction { get; } string? SolutionFilePath { get; } + + void UpdateOpenTabsPreferences(); } } diff --git a/src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs b/src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs index 09e6bb0bcd34..7004f0f0742e 100644 --- a/src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs +++ b/src/Files.App/Data/Contexts/DisplayPage/DisplayPageContext.cs @@ -131,20 +131,6 @@ public DisplayPageContext() layoutSettingsService.PropertyChanged += Settings_PropertyChanged; } - public void UpdateAllTabsAndPanesLayout() - { - var multitaskingContext = Ioc.Default.GetRequiredService(); - var tabs = multitaskingContext.Control?.GetAllTabInstances(); - var activePath = ((ShellPanesPage)multitaskingContext.CurrentTabItem.TabItemContent)?.ActivePane?.TabBarItemParameter?.NavigationParameter as string; - if (tabs is null || activePath is null) - return; - - for (int i = 0; i < tabs.Count; i++) - { - ((ShellPanesPage)tabs[i]).UpdatePanesLayout(activePath, i != multitaskingContext.CurrentTabIndex); - } - } - private void Context_Changing(object? sender, EventArgs e) { var viewModel = FolderSettings; diff --git a/src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs b/src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs index ac9e1928c592..feb20ba06c25 100644 --- a/src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs +++ b/src/Files.App/Data/Contexts/DisplayPage/IDisplayPageContext.cs @@ -17,7 +17,5 @@ public interface IDisplayPageContext : INotifyPropertyChanging, INotifyPropertyC bool SortDirectoriesAlongsideFiles { get; set; } bool SortFilesFirst { get; set; } - - void UpdateAllTabsAndPanesLayout(); } } From a8a9e61a347dc0e61c740d45ba386e4de532d8d1 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:00:55 +0100 Subject: [PATCH 13/20] Missing lines --- .../Actions/Display/SortFilesAndFoldersTogetherAction.cs | 4 +++- src/Files.App/Actions/Display/SortFilesFirstAction.cs | 4 +++- src/Files.App/Actions/Display/SortFoldersFirstAction.cs | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs b/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs index 5c183b8749dc..db693399a3a9 100644 --- a/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs +++ b/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs @@ -6,6 +6,7 @@ namespace Files.App.Actions internal sealed class SortFilesAndFoldersTogetherAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "SortFilesAndFoldersTogether".GetLocalizedResource(); @@ -19,6 +20,7 @@ public bool IsOn public SortFilesAndFoldersTogetherAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -26,7 +28,7 @@ public SortFilesAndFoldersTogetherAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirectoriesAlongsideFiles = true; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFilesFirstAction.cs b/src/Files.App/Actions/Display/SortFilesFirstAction.cs index 84e341759d56..f52f52f60e00 100644 --- a/src/Files.App/Actions/Display/SortFilesFirstAction.cs +++ b/src/Files.App/Actions/Display/SortFilesFirstAction.cs @@ -6,6 +6,7 @@ namespace Files.App.Actions internal sealed class SortFilesFirstAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "SortFilesFirst".GetLocalizedResource(); @@ -19,6 +20,7 @@ public bool IsOn public SortFilesFirstAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -27,7 +29,7 @@ public Task ExecuteAsync(object? parameter = null) { context.SortFilesFirst = true; context.SortDirectoriesAlongsideFiles = false; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFoldersFirstAction.cs b/src/Files.App/Actions/Display/SortFoldersFirstAction.cs index c662704bea97..01776e589686 100644 --- a/src/Files.App/Actions/Display/SortFoldersFirstAction.cs +++ b/src/Files.App/Actions/Display/SortFoldersFirstAction.cs @@ -6,6 +6,7 @@ namespace Files.App.Actions internal sealed class SortFoldersFirstAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; + private readonly IContentPageContext contentPageContext; public string Label => "SortFoldersFirst".GetLocalizedResource(); @@ -19,6 +20,7 @@ public bool IsOn public SortFoldersFirstAction() { context = Ioc.Default.GetRequiredService(); + contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -27,7 +29,7 @@ public Task ExecuteAsync(object? parameter = null) { context.SortFilesFirst = false; context.SortDirectoriesAlongsideFiles = false; - context.UpdateAllTabsAndPanesLayout(); + contentPageContext.UpdateOpenTabsPreferences(); return Task.CompletedTask; } From 717c17e64f53ac86c41798d366ffd0af2200bac1 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Wed, 22 Jan 2025 23:35:08 +0100 Subject: [PATCH 14/20] Move to new class --- src/Files.App/Actions/Display/GroupAction.cs | 27 ++++++------------- src/Files.App/Actions/Display/SortAction.cs | 16 ++++------- .../SortFilesAndFoldersTogetherAction.cs | 4 +-- .../Actions/Display/SortFilesFirstAction.cs | 4 +-- .../Actions/Display/SortFoldersFirstAction.cs | 4 +-- .../ContentPage/ContentPageContext.cs | 14 ---------- .../ContentPage/IContentPageContext.cs | 2 -- src/Files.App/Helpers/Layout/LayoutHelpers.cs | 22 +++++++++++++++ 8 files changed, 38 insertions(+), 55 deletions(-) create mode 100644 src/Files.App/Helpers/Layout/LayoutHelpers.cs diff --git a/src/Files.App/Actions/Display/GroupAction.cs b/src/Files.App/Actions/Display/GroupAction.cs index 53e30d48ac39..734287b45ca3 100644 --- a/src/Files.App/Actions/Display/GroupAction.cs +++ b/src/Files.App/Actions/Display/GroupAction.cs @@ -177,7 +177,7 @@ public GroupByAction() public Task ExecuteAsync(object? parameter = null) { DisplayContext.GroupOption = GroupOption; - ContentContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -378,6 +378,7 @@ public Task ExecuteAsync(object? parameter = null) { DisplayContext.GroupOption = GroupOption; DisplayContext.GroupByDateUnit = GroupByDateUnit; + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -403,7 +404,6 @@ private void DisplayContext_PropertyChanged(object? sender, PropertyChangedEvent internal sealed class GroupAscendingAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "Ascending".GetLocalizedResource(); @@ -420,7 +420,6 @@ public bool IsExecutable public GroupAscendingAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -428,7 +427,7 @@ public GroupAscendingAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = SortDirection.Ascending; - contentPageContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -450,7 +449,6 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class GroupDescendingAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "Descending".GetLocalizedResource(); @@ -467,7 +465,6 @@ public bool IsExecutable public GroupDescendingAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -475,7 +472,7 @@ public GroupDescendingAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = SortDirection.Descending; - contentPageContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -497,7 +494,6 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class ToggleGroupDirectionAction : IAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "ToggleSortDirection".GetLocalizedResource(); @@ -508,13 +504,12 @@ public string Description public ToggleGroupDirectionAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); } public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = context.SortDirection is SortDirection.Descending ? SortDirection.Ascending : SortDirection.Descending; - contentPageContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -523,7 +518,6 @@ public Task ExecuteAsync(object? parameter = null) internal sealed class GroupByYearAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "Year".GetLocalizedResource(); @@ -540,7 +534,6 @@ public bool IsExecutable public GroupByYearAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -548,7 +541,7 @@ public GroupByYearAction() public Task ExecuteAsync(object? parameter = null) { context.GroupByDateUnit = GroupByDateUnit.Year; - contentPageContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -570,7 +563,6 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class GroupByMonthAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "Month".GetLocalizedResource(); @@ -587,7 +579,6 @@ public bool IsExecutable public GroupByMonthAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -595,7 +586,7 @@ public GroupByMonthAction() public Task ExecuteAsync(object? parameter = null) { context.GroupByDateUnit = GroupByDateUnit.Month; - contentPageContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -617,7 +608,6 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class ToggleGroupByDateUnitAction : IAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "ToggleGroupingUnit".GetLocalizedResource(); @@ -628,7 +618,6 @@ public string Description public ToggleGroupByDateUnitAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); } public Task ExecuteAsync(object? parameter = null) @@ -639,7 +628,7 @@ public Task ExecuteAsync(object? parameter = null) GroupByDateUnit.Month => GroupByDateUnit.Day, _ => GroupByDateUnit.Year }; - contentPageContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortAction.cs b/src/Files.App/Actions/Display/SortAction.cs index 3f166da63418..1e78176035c9 100644 --- a/src/Files.App/Actions/Display/SortAction.cs +++ b/src/Files.App/Actions/Display/SortAction.cs @@ -165,7 +165,7 @@ public SortByAction() public Task ExecuteAsync(object? parameter = null) { displayContext.SortOption = SortOption; - contentContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -188,7 +188,6 @@ private void DisplayContext_PropertyChanged(object? sender, PropertyChangedEvent internal sealed class SortAscendingAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "Ascending".GetLocalizedResource(); @@ -202,7 +201,6 @@ public bool IsOn public SortAscendingAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -210,7 +208,7 @@ public SortAscendingAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirection = SortDirection.Ascending; - contentPageContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -225,7 +223,6 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class SortDescendingAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "Descending".GetLocalizedResource(); @@ -239,7 +236,6 @@ public bool IsOn public SortDescendingAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -247,7 +243,7 @@ public SortDescendingAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirection = SortDirection.Descending; - contentPageContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -262,7 +258,6 @@ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) internal sealed class ToggleSortDirectionAction : IAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "ToggleSortDirection".GetLocalizedResource(); @@ -273,7 +268,6 @@ public string Description public ToggleSortDirectionAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); } public Task ExecuteAsync(object? parameter = null) @@ -282,8 +276,8 @@ public Task ExecuteAsync(object? parameter = null) context.SortDirection is SortDirection.Descending ? SortDirection.Ascending : SortDirection.Descending; - - contentPageContext.UpdateOpenTabsPreferences(); + + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs b/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs index db693399a3a9..49f0311aa0d4 100644 --- a/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs +++ b/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs @@ -6,7 +6,6 @@ namespace Files.App.Actions internal sealed class SortFilesAndFoldersTogetherAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "SortFilesAndFoldersTogether".GetLocalizedResource(); @@ -20,7 +19,6 @@ public bool IsOn public SortFilesAndFoldersTogetherAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -28,7 +26,7 @@ public SortFilesAndFoldersTogetherAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirectoriesAlongsideFiles = true; - contentPageContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFilesFirstAction.cs b/src/Files.App/Actions/Display/SortFilesFirstAction.cs index f52f52f60e00..b7169e250aef 100644 --- a/src/Files.App/Actions/Display/SortFilesFirstAction.cs +++ b/src/Files.App/Actions/Display/SortFilesFirstAction.cs @@ -6,7 +6,6 @@ namespace Files.App.Actions internal sealed class SortFilesFirstAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "SortFilesFirst".GetLocalizedResource(); @@ -20,7 +19,6 @@ public bool IsOn public SortFilesFirstAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -29,7 +27,7 @@ public Task ExecuteAsync(object? parameter = null) { context.SortFilesFirst = true; context.SortDirectoriesAlongsideFiles = false; - contentPageContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFoldersFirstAction.cs b/src/Files.App/Actions/Display/SortFoldersFirstAction.cs index 01776e589686..95b815515c22 100644 --- a/src/Files.App/Actions/Display/SortFoldersFirstAction.cs +++ b/src/Files.App/Actions/Display/SortFoldersFirstAction.cs @@ -6,7 +6,6 @@ namespace Files.App.Actions internal sealed class SortFoldersFirstAction : ObservableObject, IToggleAction { private readonly IDisplayPageContext context; - private readonly IContentPageContext contentPageContext; public string Label => "SortFoldersFirst".GetLocalizedResource(); @@ -20,7 +19,6 @@ public bool IsOn public SortFoldersFirstAction() { context = Ioc.Default.GetRequiredService(); - contentPageContext = Ioc.Default.GetRequiredService(); context.PropertyChanged += Context_PropertyChanged; } @@ -29,7 +27,7 @@ public Task ExecuteAsync(object? parameter = null) { context.SortFilesFirst = false; context.SortDirectoriesAlongsideFiles = false; - contentPageContext.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs b/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs index e86ffc9264a4..ab27b91595c0 100644 --- a/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs +++ b/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs @@ -62,20 +62,6 @@ public ContentPageContext() Update(); } - public void UpdateOpenTabsPreferences() - { - var multitaskingContext = Ioc.Default.GetRequiredService(); - var tabs = multitaskingContext.Control?.GetAllTabInstances(); - var activePath = ((ShellPanesPage)multitaskingContext.CurrentTabItem.TabItemContent)?.ActivePane?.TabBarItemParameter?.NavigationParameter as string; - if (tabs is null || activePath is null) - return; - - for (int i = 0; i < tabs.Count; i++) - { - ((ShellPanesPage)tabs[i]).UpdatePanesLayout(activePath, i != multitaskingContext.CurrentTabIndex); - } - } - private void GitHelpers_IsExecutingGitActionChanged(object? sender, PropertyChangedEventArgs e) { OnPropertyChanged(nameof(CanExecuteGitAction)); diff --git a/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs b/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs index 00063f893d51..f4a4a5c8a9aa 100644 --- a/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs +++ b/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs @@ -34,7 +34,5 @@ public interface IContentPageContext : INotifyPropertyChanged bool CanExecuteGitAction { get; } string? SolutionFilePath { get; } - - void UpdateOpenTabsPreferences(); } } diff --git a/src/Files.App/Helpers/Layout/LayoutHelpers.cs b/src/Files.App/Helpers/Layout/LayoutHelpers.cs new file mode 100644 index 000000000000..8925d5cc8876 --- /dev/null +++ b/src/Files.App/Helpers/Layout/LayoutHelpers.cs @@ -0,0 +1,22 @@ +// Copyright (c) Files Community +// Licensed under the MIT License. + +namespace Files.App.Helpers +{ + static class LayoutHelpers + { + public static void UpdateOpenTabsPreferences() + { + var multitaskingContext = Ioc.Default.GetRequiredService(); + var tabs = multitaskingContext.Control?.GetAllTabInstances(); + var activePath = ((ShellPanesPage)multitaskingContext.CurrentTabItem.TabItemContent)?.ActivePane?.TabBarItemParameter?.NavigationParameter as string; + if (tabs is null || activePath is null) + return; + + for (int i = 0; i < tabs.Count; i++) + { + ((ShellPanesPage)tabs[i]).UpdatePanesLayout(activePath, i != multitaskingContext.CurrentTabIndex); + } + } + } +} From dcafc4b3bcf35cf83f6c9295ef450a932341de08 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Thu, 23 Jan 2025 09:41:26 +0100 Subject: [PATCH 15/20] Update only needed properties --- src/Files.App/Actions/Display/GroupAction.cs | 19 +++++----- src/Files.App/Actions/Display/SortAction.cs | 8 ++--- .../SortFilesAndFoldersTogetherAction.cs | 2 +- .../Actions/Display/SortFilesFirstAction.cs | 5 ++- .../Actions/Display/SortFoldersFirstAction.cs | 5 ++- .../Data/Contracts/IShellPanesPage.cs | 3 +- src/Files.App/Helpers/Layout/LayoutHelpers.cs | 4 +-- .../Layout/LayoutPreferencesManager.cs | 36 ++++++++++++++----- src/Files.App/Views/ShellPanesPage.xaml.cs | 4 +-- 9 files changed, 58 insertions(+), 28 deletions(-) diff --git a/src/Files.App/Actions/Display/GroupAction.cs b/src/Files.App/Actions/Display/GroupAction.cs index 734287b45ca3..7020496f2664 100644 --- a/src/Files.App/Actions/Display/GroupAction.cs +++ b/src/Files.App/Actions/Display/GroupAction.cs @@ -177,7 +177,7 @@ public GroupByAction() public Task ExecuteAsync(object? parameter = null) { DisplayContext.GroupOption = GroupOption; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupOption)]); return Task.CompletedTask; } @@ -378,7 +378,10 @@ public Task ExecuteAsync(object? parameter = null) { DisplayContext.GroupOption = GroupOption; DisplayContext.GroupByDateUnit = GroupByDateUnit; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([ + nameof(LayoutPreferencesItem.DirectoryGroupOption), + nameof(LayoutPreferencesItem.DirectoryGroupByDateUnit) + ]); return Task.CompletedTask; } @@ -427,7 +430,7 @@ public GroupAscendingAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = SortDirection.Ascending; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupDirection)]); return Task.CompletedTask; } @@ -472,7 +475,7 @@ public GroupDescendingAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = SortDirection.Descending; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupDirection)]); return Task.CompletedTask; } @@ -509,7 +512,7 @@ public ToggleGroupDirectionAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = context.SortDirection is SortDirection.Descending ? SortDirection.Ascending : SortDirection.Descending; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupDirection)]); return Task.CompletedTask; } @@ -541,7 +544,7 @@ public GroupByYearAction() public Task ExecuteAsync(object? parameter = null) { context.GroupByDateUnit = GroupByDateUnit.Year; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupByDateUnit)]); return Task.CompletedTask; } @@ -586,7 +589,7 @@ public GroupByMonthAction() public Task ExecuteAsync(object? parameter = null) { context.GroupByDateUnit = GroupByDateUnit.Month; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupByDateUnit)]); return Task.CompletedTask; } @@ -628,7 +631,7 @@ public Task ExecuteAsync(object? parameter = null) GroupByDateUnit.Month => GroupByDateUnit.Day, _ => GroupByDateUnit.Year }; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupByDateUnit)]); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortAction.cs b/src/Files.App/Actions/Display/SortAction.cs index 1e78176035c9..ad7e85d7d67f 100644 --- a/src/Files.App/Actions/Display/SortAction.cs +++ b/src/Files.App/Actions/Display/SortAction.cs @@ -165,7 +165,7 @@ public SortByAction() public Task ExecuteAsync(object? parameter = null) { displayContext.SortOption = SortOption; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectorySortOption)]); return Task.CompletedTask; } @@ -208,7 +208,7 @@ public SortAscendingAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirection = SortDirection.Ascending; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectorySortDirection)]); return Task.CompletedTask; } @@ -243,7 +243,7 @@ public SortDescendingAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirection = SortDirection.Descending; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectorySortDirection)]); return Task.CompletedTask; } @@ -277,7 +277,7 @@ context.SortDirection is SortDirection.Descending ? SortDirection.Ascending : SortDirection.Descending; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectorySortDirection)]); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs b/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs index 49f0311aa0d4..f58b3ce0f1b2 100644 --- a/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs +++ b/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs @@ -26,7 +26,7 @@ public SortFilesAndFoldersTogetherAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirectoriesAlongsideFiles = true; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.SortDirectoriesAlongsideFiles)]); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFilesFirstAction.cs b/src/Files.App/Actions/Display/SortFilesFirstAction.cs index b7169e250aef..e6f324684826 100644 --- a/src/Files.App/Actions/Display/SortFilesFirstAction.cs +++ b/src/Files.App/Actions/Display/SortFilesFirstAction.cs @@ -27,7 +27,10 @@ public Task ExecuteAsync(object? parameter = null) { context.SortFilesFirst = true; context.SortDirectoriesAlongsideFiles = false; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([ + nameof(LayoutPreferencesItem.SortFilesFirst), + nameof(LayoutPreferencesItem.SortDirectoriesAlongsideFiles) + ]); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFoldersFirstAction.cs b/src/Files.App/Actions/Display/SortFoldersFirstAction.cs index 95b815515c22..8ac73746316d 100644 --- a/src/Files.App/Actions/Display/SortFoldersFirstAction.cs +++ b/src/Files.App/Actions/Display/SortFoldersFirstAction.cs @@ -27,7 +27,10 @@ public Task ExecuteAsync(object? parameter = null) { context.SortFilesFirst = false; context.SortDirectoriesAlongsideFiles = false; - LayoutHelpers.UpdateOpenTabsPreferences(); + LayoutHelpers.UpdateOpenTabsPreferences([ + nameof(LayoutPreferencesItem.SortFilesFirst), + nameof(LayoutPreferencesItem.SortDirectoriesAlongsideFiles) + ]); return Task.CompletedTask; } diff --git a/src/Files.App/Data/Contracts/IShellPanesPage.cs b/src/Files.App/Data/Contracts/IShellPanesPage.cs index 0216aa8a264c..37082471a165 100644 --- a/src/Files.App/Data/Contracts/IShellPanesPage.cs +++ b/src/Files.App/Data/Contracts/IShellPanesPage.cs @@ -63,7 +63,8 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged /// Updates the layout of open panes. /// /// The path of panes to update + /// The preferences to update /// Whether the active pane should be updated or not - public void UpdatePanesLayout(string targetPath, bool includeActivePane = false); + public void UpdatePanesLayout(string targetPath, string[] preferences, bool includeActivePane = false); } } diff --git a/src/Files.App/Helpers/Layout/LayoutHelpers.cs b/src/Files.App/Helpers/Layout/LayoutHelpers.cs index 8925d5cc8876..7d48183ad368 100644 --- a/src/Files.App/Helpers/Layout/LayoutHelpers.cs +++ b/src/Files.App/Helpers/Layout/LayoutHelpers.cs @@ -5,7 +5,7 @@ namespace Files.App.Helpers { static class LayoutHelpers { - public static void UpdateOpenTabsPreferences() + public static void UpdateOpenTabsPreferences(string[] preferences) { var multitaskingContext = Ioc.Default.GetRequiredService(); var tabs = multitaskingContext.Control?.GetAllTabInstances(); @@ -15,7 +15,7 @@ public static void UpdateOpenTabsPreferences() for (int i = 0; i < tabs.Count; i++) { - ((ShellPanesPage)tabs[i]).UpdatePanesLayout(activePath, i != multitaskingContext.CurrentTabIndex); + ((ShellPanesPage)tabs[i]).UpdatePanesLayout(activePath, preferences, i != multitaskingContext.CurrentTabIndex); } } } diff --git a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs index b8e159d2000d..6cf46cbdd03c 100644 --- a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs +++ b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs @@ -265,7 +265,7 @@ public Type GetLayoutType(string path, bool changeLayoutMode = true) }; } - public void UpdateGroupAndSortOptions(string? path) + public void UpdateGroupAndSortOptions(string? path, string[] properties) { if (string.IsNullOrWhiteSpace(path)) return; @@ -274,13 +274,33 @@ public void UpdateGroupAndSortOptions(string? path) if (preferencesItem is null) return; - DirectorySortOption = preferencesItem.DirectorySortOption; - DirectorySortDirection = preferencesItem.DirectorySortDirection; - DirectoryGroupOption = preferencesItem.DirectoryGroupOption; - DirectoryGroupByDateUnit = preferencesItem.DirectoryGroupByDateUnit; - DirectoryGroupDirection = preferencesItem.DirectoryGroupDirection; - SortDirectoriesAlongsideFiles = preferencesItem.SortDirectoriesAlongsideFiles; - SortFilesFirst = preferencesItem.SortFilesFirst; + foreach (var property in properties) + { + switch (property) + { + case nameof(preferencesItem.DirectorySortOption): + DirectorySortOption = preferencesItem.DirectorySortOption; + break; + case nameof(preferencesItem.DirectorySortDirection): + DirectorySortDirection = preferencesItem.DirectorySortDirection; + break; + case nameof(preferencesItem.DirectoryGroupOption): + DirectoryGroupOption = preferencesItem.DirectoryGroupOption; + break; + case nameof(preferencesItem.DirectoryGroupByDateUnit): + DirectoryGroupByDateUnit = preferencesItem.DirectoryGroupByDateUnit; + break; + case nameof(preferencesItem.DirectoryGroupDirection): + DirectoryGroupDirection = preferencesItem.DirectoryGroupDirection; + break; + case nameof(preferencesItem.SortDirectoriesAlongsideFiles): + SortDirectoriesAlongsideFiles = preferencesItem.SortDirectoriesAlongsideFiles; + break; + case nameof(preferencesItem.SortFilesFirst): + SortFilesFirst = preferencesItem.SortFilesFirst; + break; + } + } } public bool IsPathUsingDefaultLayout(string? path) diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index ae49996505e3..daa78baa9d15 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -358,7 +358,7 @@ public void FocusOtherPane() } /// - public void UpdatePanesLayout(string targetPath, bool includeActivePane = false) + public void UpdatePanesLayout(string targetPath, string[] preferences, bool includeActivePane = false) { foreach (var pane in GetPanes()) { @@ -369,7 +369,7 @@ path is not null && path.Equals(targetPath, StringComparison.OrdinalIgnoreCase))) { var page = pane.SlimContentPage as BaseLayoutPage; - page?.FolderSettings?.UpdateGroupAndSortOptions(path); + page?.FolderSettings?.UpdateGroupAndSortOptions(path, preferences); } } } From 3084211f7a56dc910662cd84f971d4657a14bc4d Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Thu, 23 Jan 2025 16:35:54 +0100 Subject: [PATCH 16/20] Revert "Update only needed properties" This reverts commit dcafc4b3bcf35cf83f6c9295ef450a932341de08. --- src/Files.App/Actions/Display/GroupAction.cs | 19 +++++----- src/Files.App/Actions/Display/SortAction.cs | 8 ++--- .../SortFilesAndFoldersTogetherAction.cs | 2 +- .../Actions/Display/SortFilesFirstAction.cs | 5 +-- .../Actions/Display/SortFoldersFirstAction.cs | 5 +-- .../Data/Contracts/IShellPanesPage.cs | 3 +- src/Files.App/Helpers/Layout/LayoutHelpers.cs | 4 +-- .../Layout/LayoutPreferencesManager.cs | 36 +++++-------------- src/Files.App/Views/ShellPanesPage.xaml.cs | 4 +-- 9 files changed, 28 insertions(+), 58 deletions(-) diff --git a/src/Files.App/Actions/Display/GroupAction.cs b/src/Files.App/Actions/Display/GroupAction.cs index 7020496f2664..734287b45ca3 100644 --- a/src/Files.App/Actions/Display/GroupAction.cs +++ b/src/Files.App/Actions/Display/GroupAction.cs @@ -177,7 +177,7 @@ public GroupByAction() public Task ExecuteAsync(object? parameter = null) { DisplayContext.GroupOption = GroupOption; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupOption)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -378,10 +378,7 @@ public Task ExecuteAsync(object? parameter = null) { DisplayContext.GroupOption = GroupOption; DisplayContext.GroupByDateUnit = GroupByDateUnit; - LayoutHelpers.UpdateOpenTabsPreferences([ - nameof(LayoutPreferencesItem.DirectoryGroupOption), - nameof(LayoutPreferencesItem.DirectoryGroupByDateUnit) - ]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -430,7 +427,7 @@ public GroupAscendingAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = SortDirection.Ascending; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupDirection)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -475,7 +472,7 @@ public GroupDescendingAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = SortDirection.Descending; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupDirection)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -512,7 +509,7 @@ public ToggleGroupDirectionAction() public Task ExecuteAsync(object? parameter = null) { context.GroupDirection = context.SortDirection is SortDirection.Descending ? SortDirection.Ascending : SortDirection.Descending; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupDirection)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -544,7 +541,7 @@ public GroupByYearAction() public Task ExecuteAsync(object? parameter = null) { context.GroupByDateUnit = GroupByDateUnit.Year; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupByDateUnit)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -589,7 +586,7 @@ public GroupByMonthAction() public Task ExecuteAsync(object? parameter = null) { context.GroupByDateUnit = GroupByDateUnit.Month; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupByDateUnit)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -631,7 +628,7 @@ public Task ExecuteAsync(object? parameter = null) GroupByDateUnit.Month => GroupByDateUnit.Day, _ => GroupByDateUnit.Year }; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectoryGroupByDateUnit)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortAction.cs b/src/Files.App/Actions/Display/SortAction.cs index ad7e85d7d67f..1e78176035c9 100644 --- a/src/Files.App/Actions/Display/SortAction.cs +++ b/src/Files.App/Actions/Display/SortAction.cs @@ -165,7 +165,7 @@ public SortByAction() public Task ExecuteAsync(object? parameter = null) { displayContext.SortOption = SortOption; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectorySortOption)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -208,7 +208,7 @@ public SortAscendingAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirection = SortDirection.Ascending; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectorySortDirection)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -243,7 +243,7 @@ public SortDescendingAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirection = SortDirection.Descending; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectorySortDirection)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } @@ -277,7 +277,7 @@ context.SortDirection is SortDirection.Descending ? SortDirection.Ascending : SortDirection.Descending; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.DirectorySortDirection)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs b/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs index f58b3ce0f1b2..49f0311aa0d4 100644 --- a/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs +++ b/src/Files.App/Actions/Display/SortFilesAndFoldersTogetherAction.cs @@ -26,7 +26,7 @@ public SortFilesAndFoldersTogetherAction() public Task ExecuteAsync(object? parameter = null) { context.SortDirectoriesAlongsideFiles = true; - LayoutHelpers.UpdateOpenTabsPreferences([nameof(LayoutPreferencesItem.SortDirectoriesAlongsideFiles)]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFilesFirstAction.cs b/src/Files.App/Actions/Display/SortFilesFirstAction.cs index e6f324684826..b7169e250aef 100644 --- a/src/Files.App/Actions/Display/SortFilesFirstAction.cs +++ b/src/Files.App/Actions/Display/SortFilesFirstAction.cs @@ -27,10 +27,7 @@ public Task ExecuteAsync(object? parameter = null) { context.SortFilesFirst = true; context.SortDirectoriesAlongsideFiles = false; - LayoutHelpers.UpdateOpenTabsPreferences([ - nameof(LayoutPreferencesItem.SortFilesFirst), - nameof(LayoutPreferencesItem.SortDirectoriesAlongsideFiles) - ]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Actions/Display/SortFoldersFirstAction.cs b/src/Files.App/Actions/Display/SortFoldersFirstAction.cs index 8ac73746316d..95b815515c22 100644 --- a/src/Files.App/Actions/Display/SortFoldersFirstAction.cs +++ b/src/Files.App/Actions/Display/SortFoldersFirstAction.cs @@ -27,10 +27,7 @@ public Task ExecuteAsync(object? parameter = null) { context.SortFilesFirst = false; context.SortDirectoriesAlongsideFiles = false; - LayoutHelpers.UpdateOpenTabsPreferences([ - nameof(LayoutPreferencesItem.SortFilesFirst), - nameof(LayoutPreferencesItem.SortDirectoriesAlongsideFiles) - ]); + LayoutHelpers.UpdateOpenTabsPreferences(); return Task.CompletedTask; } diff --git a/src/Files.App/Data/Contracts/IShellPanesPage.cs b/src/Files.App/Data/Contracts/IShellPanesPage.cs index 37082471a165..0216aa8a264c 100644 --- a/src/Files.App/Data/Contracts/IShellPanesPage.cs +++ b/src/Files.App/Data/Contracts/IShellPanesPage.cs @@ -63,8 +63,7 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged /// Updates the layout of open panes. /// /// The path of panes to update - /// The preferences to update /// Whether the active pane should be updated or not - public void UpdatePanesLayout(string targetPath, string[] preferences, bool includeActivePane = false); + public void UpdatePanesLayout(string targetPath, bool includeActivePane = false); } } diff --git a/src/Files.App/Helpers/Layout/LayoutHelpers.cs b/src/Files.App/Helpers/Layout/LayoutHelpers.cs index 7d48183ad368..8925d5cc8876 100644 --- a/src/Files.App/Helpers/Layout/LayoutHelpers.cs +++ b/src/Files.App/Helpers/Layout/LayoutHelpers.cs @@ -5,7 +5,7 @@ namespace Files.App.Helpers { static class LayoutHelpers { - public static void UpdateOpenTabsPreferences(string[] preferences) + public static void UpdateOpenTabsPreferences() { var multitaskingContext = Ioc.Default.GetRequiredService(); var tabs = multitaskingContext.Control?.GetAllTabInstances(); @@ -15,7 +15,7 @@ public static void UpdateOpenTabsPreferences(string[] preferences) for (int i = 0; i < tabs.Count; i++) { - ((ShellPanesPage)tabs[i]).UpdatePanesLayout(activePath, preferences, i != multitaskingContext.CurrentTabIndex); + ((ShellPanesPage)tabs[i]).UpdatePanesLayout(activePath, i != multitaskingContext.CurrentTabIndex); } } } diff --git a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs index 6cf46cbdd03c..b8e159d2000d 100644 --- a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs +++ b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs @@ -265,7 +265,7 @@ public Type GetLayoutType(string path, bool changeLayoutMode = true) }; } - public void UpdateGroupAndSortOptions(string? path, string[] properties) + public void UpdateGroupAndSortOptions(string? path) { if (string.IsNullOrWhiteSpace(path)) return; @@ -274,33 +274,13 @@ public void UpdateGroupAndSortOptions(string? path, string[] properties) if (preferencesItem is null) return; - foreach (var property in properties) - { - switch (property) - { - case nameof(preferencesItem.DirectorySortOption): - DirectorySortOption = preferencesItem.DirectorySortOption; - break; - case nameof(preferencesItem.DirectorySortDirection): - DirectorySortDirection = preferencesItem.DirectorySortDirection; - break; - case nameof(preferencesItem.DirectoryGroupOption): - DirectoryGroupOption = preferencesItem.DirectoryGroupOption; - break; - case nameof(preferencesItem.DirectoryGroupByDateUnit): - DirectoryGroupByDateUnit = preferencesItem.DirectoryGroupByDateUnit; - break; - case nameof(preferencesItem.DirectoryGroupDirection): - DirectoryGroupDirection = preferencesItem.DirectoryGroupDirection; - break; - case nameof(preferencesItem.SortDirectoriesAlongsideFiles): - SortDirectoriesAlongsideFiles = preferencesItem.SortDirectoriesAlongsideFiles; - break; - case nameof(preferencesItem.SortFilesFirst): - SortFilesFirst = preferencesItem.SortFilesFirst; - break; - } - } + DirectorySortOption = preferencesItem.DirectorySortOption; + DirectorySortDirection = preferencesItem.DirectorySortDirection; + DirectoryGroupOption = preferencesItem.DirectoryGroupOption; + DirectoryGroupByDateUnit = preferencesItem.DirectoryGroupByDateUnit; + DirectoryGroupDirection = preferencesItem.DirectoryGroupDirection; + SortDirectoriesAlongsideFiles = preferencesItem.SortDirectoriesAlongsideFiles; + SortFilesFirst = preferencesItem.SortFilesFirst; } public bool IsPathUsingDefaultLayout(string? path) diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index daa78baa9d15..ae49996505e3 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -358,7 +358,7 @@ public void FocusOtherPane() } /// - public void UpdatePanesLayout(string targetPath, string[] preferences, bool includeActivePane = false) + public void UpdatePanesLayout(string targetPath, bool includeActivePane = false) { foreach (var pane in GetPanes()) { @@ -369,7 +369,7 @@ path is not null && path.Equals(targetPath, StringComparison.OrdinalIgnoreCase))) { var page = pane.SlimContentPage as BaseLayoutPage; - page?.FolderSettings?.UpdateGroupAndSortOptions(path, preferences); + page?.FolderSettings?.UpdateGroupAndSortOptions(path); } } } From 61931526a8d677eaef5685859eb927aa4825986b Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Fri, 24 Jan 2025 08:46:19 +0100 Subject: [PATCH 17/20] Update method names --- src/Files.App/Data/Contracts/IShellPanesPage.cs | 2 +- src/Files.App/Helpers/Layout/LayoutHelpers.cs | 2 +- src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs | 2 +- src/Files.App/Views/ShellPanesPage.xaml.cs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Files.App/Data/Contracts/IShellPanesPage.cs b/src/Files.App/Data/Contracts/IShellPanesPage.cs index 0216aa8a264c..0cdef2f15126 100644 --- a/src/Files.App/Data/Contracts/IShellPanesPage.cs +++ b/src/Files.App/Data/Contracts/IShellPanesPage.cs @@ -64,6 +64,6 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged /// /// The path of panes to update /// Whether the active pane should be updated or not - public void UpdatePanesLayout(string targetPath, bool includeActivePane = false); + public void UpdateOpenPanesPreferences(string targetPath, bool includeActivePane = false); } } diff --git a/src/Files.App/Helpers/Layout/LayoutHelpers.cs b/src/Files.App/Helpers/Layout/LayoutHelpers.cs index 8925d5cc8876..df9a875f27c6 100644 --- a/src/Files.App/Helpers/Layout/LayoutHelpers.cs +++ b/src/Files.App/Helpers/Layout/LayoutHelpers.cs @@ -15,7 +15,7 @@ public static void UpdateOpenTabsPreferences() for (int i = 0; i < tabs.Count; i++) { - ((ShellPanesPage)tabs[i]).UpdatePanesLayout(activePath, i != multitaskingContext.CurrentTabIndex); + ((ShellPanesPage)tabs[i]).UpdateOpenPanesPreferences(activePath, i != multitaskingContext.CurrentTabIndex); } } } diff --git a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs index b8e159d2000d..90e6a1a1808b 100644 --- a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs +++ b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs @@ -265,7 +265,7 @@ public Type GetLayoutType(string path, bool changeLayoutMode = true) }; } - public void UpdateGroupAndSortOptions(string? path) + public void ReloadGroupAndSortPreferences(string? path) { if (string.IsNullOrWhiteSpace(path)) return; diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index ae49996505e3..0b6d0571a4a9 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -358,7 +358,7 @@ public void FocusOtherPane() } /// - public void UpdatePanesLayout(string targetPath, bool includeActivePane = false) + public void UpdateOpenPanesPreferences(string targetPath, bool includeActivePane = false) { foreach (var pane in GetPanes()) { @@ -369,7 +369,7 @@ path is not null && path.Equals(targetPath, StringComparison.OrdinalIgnoreCase))) { var page = pane.SlimContentPage as BaseLayoutPage; - page?.FolderSettings?.UpdateGroupAndSortOptions(path); + page?.FolderSettings?.ReloadGroupAndSortPreferences(path); } } } From 65edd082d4519d5f499f747bede1d01358379417 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Fri, 24 Jan 2025 17:19:25 +0100 Subject: [PATCH 18/20] Move method to LayoutHelpers --- .../Data/Contracts/IShellPanesPage.cs | 7 +++---- src/Files.App/Helpers/Layout/LayoutHelpers.cs | 20 +++++++++++++++--- src/Files.App/Views/ShellPanesPage.xaml.cs | 21 ++----------------- 3 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/Files.App/Data/Contracts/IShellPanesPage.cs b/src/Files.App/Data/Contracts/IShellPanesPage.cs index 0cdef2f15126..afeace482ef9 100644 --- a/src/Files.App/Data/Contracts/IShellPanesPage.cs +++ b/src/Files.App/Data/Contracts/IShellPanesPage.cs @@ -60,10 +60,9 @@ public interface IShellPanesPage : IDisposable, INotifyPropertyChanged public void FocusOtherPane(); /// - /// Updates the layout of open panes. + /// Gets open panes. /// - /// The path of panes to update - /// Whether the active pane should be updated or not - public void UpdateOpenPanesPreferences(string targetPath, bool includeActivePane = false); + /// An enumerable containing open panes. + public IEnumerable GetPanes(); } } diff --git a/src/Files.App/Helpers/Layout/LayoutHelpers.cs b/src/Files.App/Helpers/Layout/LayoutHelpers.cs index df9a875f27c6..12a9461ebc24 100644 --- a/src/Files.App/Helpers/Layout/LayoutHelpers.cs +++ b/src/Files.App/Helpers/Layout/LayoutHelpers.cs @@ -3,8 +3,8 @@ namespace Files.App.Helpers { - static class LayoutHelpers - { + static class LayoutHelpers + { public static void UpdateOpenTabsPreferences() { var multitaskingContext = Ioc.Default.GetRequiredService(); @@ -13,9 +13,23 @@ public static void UpdateOpenTabsPreferences() if (tabs is null || activePath is null) return; + var layoutSettingsService = Ioc.Default.GetRequiredService(); for (int i = 0; i < tabs.Count; i++) { - ((ShellPanesPage)tabs[i]).UpdateOpenPanesPreferences(activePath, i != multitaskingContext.CurrentTabIndex); + var isNotCurrentTab = i != multitaskingContext.CurrentTabIndex; + var shPage = (ShellPanesPage)tabs[i]; + foreach (var pane in shPage.GetPanes()) + { + var path = pane.ShellViewModel.CurrentFolder?.ItemPath; + if ((isNotCurrentTab || pane != shPage.ActivePane) && + (layoutSettingsService.SyncFolderPreferencesAcrossDirectories || + path is not null && + path.Equals(activePath, StringComparison.OrdinalIgnoreCase))) + { + var page = pane.SlimContentPage as BaseLayoutPage; + page?.FolderSettings?.ReloadGroupAndSortPreferences(path); + } + } } } } diff --git a/src/Files.App/Views/ShellPanesPage.xaml.cs b/src/Files.App/Views/ShellPanesPage.xaml.cs index 0b6d0571a4a9..d0f26eeb5b36 100644 --- a/src/Files.App/Views/ShellPanesPage.xaml.cs +++ b/src/Files.App/Views/ShellPanesPage.xaml.cs @@ -19,7 +19,6 @@ public sealed partial class ShellPanesPage : Page, IShellPanesPage, ITabBarItemC // Dependency injections private IGeneralSettingsService GeneralSettingsService { get; } = Ioc.Default.GetRequiredService(); - private ILayoutSettingsService LayoutSettingsService { get; } = Ioc.Default.GetRequiredService(); private AppModel AppModel { get; } = Ioc.Default.GetRequiredService(); // Constants @@ -358,20 +357,9 @@ public void FocusOtherPane() } /// - public void UpdateOpenPanesPreferences(string targetPath, bool includeActivePane = false) + public IEnumerable GetPanes() { - foreach (var pane in GetPanes()) - { - var path = pane.ShellViewModel.CurrentFolder?.ItemPath; - if ((includeActivePane || pane != ActivePane) && - (LayoutSettingsService.SyncFolderPreferencesAcrossDirectories || - path is not null && - path.Equals(targetPath, StringComparison.OrdinalIgnoreCase))) - { - var page = pane.SlimContentPage as BaseLayoutPage; - page?.FolderSettings?.ReloadGroupAndSortPreferences(path); - } - } + return RootGrid.Children.Where(x => RootGrid.Children.IndexOf(x) % 2 == 0).Cast(); } // Private methods @@ -390,11 +378,6 @@ private int GetPaneCount() return (RootGrid.Children.Count + 1) / 2; } - private IEnumerable GetPanes() - { - return RootGrid.Children.Where(x => RootGrid.Children.IndexOf(x) % 2 == 0).Cast(); - } - private IEnumerable GetSizers() { return RootGrid.Children.Where(x => RootGrid.Children.IndexOf(x) % 2 == 1).Cast(); From 534f5728abeff1d51122b47b6cfa0b21701cf6e6 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Sun, 26 Jan 2025 16:29:45 +0100 Subject: [PATCH 19/20] Update src/Files.App/Helpers/Layout/LayoutHelpers.cs Co-authored-by: Yair <39923744+yaira2@users.noreply.github.com> Signed-off-by: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> --- src/Files.App/Helpers/Layout/LayoutHelpers.cs | 59 +++++++++++-------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/src/Files.App/Helpers/Layout/LayoutHelpers.cs b/src/Files.App/Helpers/Layout/LayoutHelpers.cs index 12a9461ebc24..dfcc84056fe0 100644 --- a/src/Files.App/Helpers/Layout/LayoutHelpers.cs +++ b/src/Files.App/Helpers/Layout/LayoutHelpers.cs @@ -5,32 +5,45 @@ namespace Files.App.Helpers { static class LayoutHelpers { - public static void UpdateOpenTabsPreferences() - { - var multitaskingContext = Ioc.Default.GetRequiredService(); - var tabs = multitaskingContext.Control?.GetAllTabInstances(); - var activePath = ((ShellPanesPage)multitaskingContext.CurrentTabItem.TabItemContent)?.ActivePane?.TabBarItemParameter?.NavigationParameter as string; - if (tabs is null || activePath is null) - return; +public static void UpdateOpenTabsPreferences() +{ + // Services + var multitaskingContext = Ioc.Default.GetRequiredService(); + var layoutSettingsService = Ioc.Default.GetRequiredService(); + + // Get all tab instances and active path + var tabs = multitaskingContext.Control?.GetAllTabInstances(); + var activePath = (multitaskingContext.CurrentTabItem?.TabItemContent as ShellPanesPage)?.ActivePane?.TabBarItemParameter?.NavigationParameter as string; + + // Return if required data is missing + if (tabs is null || activePath is null) + return; + + for (int i = 0; i < tabs.Count; i++) + { + var isNotCurrentTab = i != multitaskingContext.CurrentTabIndex; + var shPage = tabs[i] as ShellPanesPage; - var layoutSettingsService = Ioc.Default.GetRequiredService(); - for (int i = 0; i < tabs.Count; i++) + if (shPage is not null) + { + foreach (var pane in shPage.GetPanes()) { - var isNotCurrentTab = i != multitaskingContext.CurrentTabIndex; - var shPage = (ShellPanesPage)tabs[i]; - foreach (var pane in shPage.GetPanes()) - { - var path = pane.ShellViewModel.CurrentFolder?.ItemPath; - if ((isNotCurrentTab || pane != shPage.ActivePane) && - (layoutSettingsService.SyncFolderPreferencesAcrossDirectories || - path is not null && - path.Equals(activePath, StringComparison.OrdinalIgnoreCase))) - { - var page = pane.SlimContentPage as BaseLayoutPage; - page?.FolderSettings?.ReloadGroupAndSortPreferences(path); - } - } + var path = pane.ShellViewModel?.CurrentFolder?.ItemPath; + + // Skip panes without a valid path + if (path is null) + continue; + + // Check if we need to update preferences for this pane + if ((isNotCurrentTab || pane != shPage.ActivePane) && + (layoutSettingsService.SyncFolderPreferencesAcrossDirectories || + path.Equals(activePath, StringComparison.OrdinalIgnoreCase))) + if (pane.SlimContentPage is BaseLayoutPage page) + page.FolderSettings?.ReloadGroupAndSortPreferences(path); } } } +} + } + } } From caec4e0fa4152a17b9b3aeb7898cedb597640523 Mon Sep 17 00:00:00 2001 From: Filippo Ferrario <102259289+ferrariofilippo@users.noreply.github.com> Date: Sun, 26 Jan 2025 16:38:51 +0100 Subject: [PATCH 20/20] Build errors --- src/Files.App/Helpers/Layout/LayoutHelpers.cs | 63 +++++++++---------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/src/Files.App/Helpers/Layout/LayoutHelpers.cs b/src/Files.App/Helpers/Layout/LayoutHelpers.cs index dfcc84056fe0..500d553df43b 100644 --- a/src/Files.App/Helpers/Layout/LayoutHelpers.cs +++ b/src/Files.App/Helpers/Layout/LayoutHelpers.cs @@ -5,45 +5,44 @@ namespace Files.App.Helpers { static class LayoutHelpers { -public static void UpdateOpenTabsPreferences() -{ - // Services - var multitaskingContext = Ioc.Default.GetRequiredService(); - var layoutSettingsService = Ioc.Default.GetRequiredService(); + public static void UpdateOpenTabsPreferences() + { + // Services + var multitaskingContext = Ioc.Default.GetRequiredService(); + var layoutSettingsService = Ioc.Default.GetRequiredService(); - // Get all tab instances and active path - var tabs = multitaskingContext.Control?.GetAllTabInstances(); - var activePath = (multitaskingContext.CurrentTabItem?.TabItemContent as ShellPanesPage)?.ActivePane?.TabBarItemParameter?.NavigationParameter as string; + // Get all tab instances and active path + var tabs = multitaskingContext.Control?.GetAllTabInstances(); + var activePath = (multitaskingContext.CurrentTabItem?.TabItemContent as ShellPanesPage)?.ActivePane?.TabBarItemParameter?.NavigationParameter as string; - // Return if required data is missing - if (tabs is null || activePath is null) - return; + // Return if required data is missing + if (tabs is null || activePath is null) + return; - for (int i = 0; i < tabs.Count; i++) - { - var isNotCurrentTab = i != multitaskingContext.CurrentTabIndex; - var shPage = tabs[i] as ShellPanesPage; - - if (shPage is not null) - { - foreach (var pane in shPage.GetPanes()) + for (int i = 0; i < tabs.Count; i++) { - var path = pane.ShellViewModel?.CurrentFolder?.ItemPath; + var isNotCurrentTab = i != multitaskingContext.CurrentTabIndex; + var shPage = tabs[i] as ShellPanesPage; - // Skip panes without a valid path - if (path is null) - continue; + if (shPage is not null) + { + foreach (var pane in shPage.GetPanes()) + { + var path = pane.ShellViewModel?.CurrentFolder?.ItemPath; - // Check if we need to update preferences for this pane - if ((isNotCurrentTab || pane != shPage.ActivePane) && - (layoutSettingsService.SyncFolderPreferencesAcrossDirectories || - path.Equals(activePath, StringComparison.OrdinalIgnoreCase))) - if (pane.SlimContentPage is BaseLayoutPage page) - page.FolderSettings?.ReloadGroupAndSortPreferences(path); + // Skip panes without a valid path + if (path is null) + continue; + + // Check if we need to update preferences for this pane + if ((isNotCurrentTab || pane != shPage.ActivePane) && + (layoutSettingsService.SyncFolderPreferencesAcrossDirectories || + path.Equals(activePath, StringComparison.OrdinalIgnoreCase))) + if (pane.SlimContentPage is BaseLayoutPage page) + page.FolderSettings?.ReloadGroupAndSortPreferences(path); + } + } } } } -} - } - } }