Skip to content

Commit 71574b6

Browse files
yaira2yaira2
committed
Fixed actions
1 parent 4a1ca56 commit 71574b6

26 files changed

+109
-26
lines changed

‎src/Files.App/Actions/Content/Archives/Compress/BaseCompressArchiveAction.cs

+2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ private bool IsContextPageTypeAdaptedToCommand()
5151
return
5252
context.PageType != ContentPageTypes.RecycleBin &&
5353
context.PageType != ContentPageTypes.ZipFolder &&
54+
context.PageType != ContentPageTypes.ReleaseNotes &&
55+
context.PageType != ContentPageTypes.Settings &&
5456
context.PageType != ContentPageTypes.None;
5557
}
5658

‎src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ protected bool IsContextPageTypeAdaptedToCommand()
4343
return
4444
context.PageType != ContentPageTypes.RecycleBin &&
4545
context.PageType != ContentPageTypes.ZipFolder &&
46+
context.PageType != ContentPageTypes.ReleaseNotes &&
47+
context.PageType != ContentPageTypes.Settings &&
4648
context.PageType != ContentPageTypes.None;
4749
}
4850

‎src/Files.App/Actions/Content/Background/BaseSetAsAction.cs

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ internal abstract class BaseSetAsAction : ObservableObject, IAction
2121
ContentPageContext.ShellPage is not null &&
2222
ContentPageContext.PageType != ContentPageTypes.RecycleBin &&
2323
ContentPageContext.PageType != ContentPageTypes.ZipFolder &&
24+
ContentPageContext.PageType != ContentPageTypes.ReleaseNotes &&
25+
ContentPageContext.PageType != ContentPageTypes.Settings &&
2426
(ContentPageContext.ShellPage?.SlimContentPage?.SelectedItemsPropertiesViewModel?.IsCompatibleToSetAsWindowsWallpaper ?? false);
2527

2628
public BaseSetAsAction()

‎src/Files.App/Actions/Content/ImageManipulation/BaseRotateAction.cs

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ private bool IsContextPageTypeAdaptedToCommand()
4545
return
4646
context.PageType != ContentPageTypes.RecycleBin &&
4747
context.PageType != ContentPageTypes.ZipFolder &&
48+
context.PageType != ContentPageTypes.ReleaseNotes &&
49+
context.PageType != ContentPageTypes.Settings &&
4850
context.PageType != ContentPageTypes.None;
4951
}
5052

‎src/Files.App/Actions/FileSystem/CopyPathAction.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ public string Description
1818
public RichGlyph Glyph
1919
=> new RichGlyph(themedIconStyle: "App.ThemedIcons.CopyAsPath");
2020

21-
public bool IsExecutable
22-
=> context.PageType != ContentPageTypes.Home && context.PageType != ContentPageTypes.RecycleBin;
21+
public bool IsExecutable =>
22+
context.PageType != ContentPageTypes.Home &&
23+
context.PageType != ContentPageTypes.RecycleBin &&
24+
context.PageType != ContentPageTypes.ReleaseNotes &&
25+
context.PageType != ContentPageTypes.Settings;
2326

2427
public CopyPathAction()
2528
{

‎src/Files.App/Actions/FileSystem/CopyPathWithQuotesAction.cs

+5-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ public string Description
1818
public RichGlyph Glyph
1919
=> new RichGlyph(themedIconStyle: "App.ThemedIcons.CopyAsPath");
2020

21-
public bool IsExecutable
22-
=> context.PageType != ContentPageTypes.Home && context.PageType != ContentPageTypes.RecycleBin;
21+
public bool IsExecutable =>
22+
context.PageType != ContentPageTypes.Home &&
23+
context.PageType != ContentPageTypes.RecycleBin &&
24+
context.PageType != ContentPageTypes.ReleaseNotes &&
25+
context.PageType != ContentPageTypes.Settings;
2326

2427
public CopyPathWithQuotesAction()
2528
{

‎src/Files.App/Actions/FileSystem/PasteItemAction.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ public bool GetIsExecutable()
5353
App.AppModel.IsPasteEnabled &&
5454
context.PageType != ContentPageTypes.Home &&
5555
context.PageType != ContentPageTypes.RecycleBin &&
56-
context.PageType != ContentPageTypes.SearchResults;
56+
context.PageType != ContentPageTypes.SearchResults &&
57+
context.PageType != ContentPageTypes.ReleaseNotes &&
58+
context.PageType != ContentPageTypes.Settings;
5759
}
5860

5961
private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

‎src/Files.App/Actions/FileSystem/PasteItemAsShortcutAction.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ public bool GetIsExecutable()
4242
App.AppModel.IsPasteEnabled &&
4343
context.PageType != ContentPageTypes.Home &&
4444
context.PageType != ContentPageTypes.RecycleBin &&
45-
context.PageType != ContentPageTypes.SearchResults;
45+
context.PageType != ContentPageTypes.SearchResults &&
46+
context.PageType != ContentPageTypes.ReleaseNotes &&
47+
context.PageType != ContentPageTypes.Settings;
4648
}
4749

4850
private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)

‎src/Files.App/Actions/FileSystem/PasteItemToSelectionAction.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public bool GetIsExecutable()
4747
if (!App.AppModel.IsPasteEnabled)
4848
return false;
4949

50-
if (context.PageType is ContentPageTypes.Home or ContentPageTypes.RecycleBin or ContentPageTypes.SearchResults)
50+
if (context.PageType is ContentPageTypes.Home or ContentPageTypes.RecycleBin or ContentPageTypes.SearchResults or ContentPageTypes.ReleaseNotes or ContentPageTypes.Settings)
5151
return false;
5252

5353
if (!context.HasSelection)

‎src/Files.App/Actions/FileSystem/RenameAction.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@ private bool IsPageTypeValid()
5252
context.PageType != ContentPageTypes.None &&
5353
context.PageType != ContentPageTypes.Home &&
5454
context.PageType != ContentPageTypes.RecycleBin &&
55-
context.PageType != ContentPageTypes.ZipFolder;
55+
context.PageType != ContentPageTypes.ZipFolder &&
56+
context.PageType != ContentPageTypes.ReleaseNotes &&
57+
context.PageType != ContentPageTypes.Settings;
5658
}
5759

5860
private void Context_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)

‎src/Files.App/Actions/Open/OpenTerminalAction.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ protected virtual string[] GetPaths()
9696

9797
private bool GetIsExecutable()
9898
{
99-
if (context.PageType is ContentPageTypes.None or ContentPageTypes.Home or ContentPageTypes.RecycleBin or ContentPageTypes.ZipFolder)
99+
if (context.PageType is ContentPageTypes.None or ContentPageTypes.Home or ContentPageTypes.RecycleBin or ContentPageTypes.ZipFolder or ContentPageTypes.ReleaseNotes or ContentPageTypes.Settings)
100100
return false;
101101

102102
var isFolderNull = context.Folder is null;

‎src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ private void InstanceViewModel_PropertyChanged(object? sender, PropertyChangedEv
147147
case nameof(CurrentInstanceViewModel.IsPageTypeCloudDrive):
148148
case nameof(CurrentInstanceViewModel.IsPageTypeMtpDevice):
149149
case nameof(CurrentInstanceViewModel.IsPageTypeSearchResults):
150+
case nameof(CurrentInstanceViewModel.IsPageTypeReleaseNotes):
151+
case nameof(CurrentInstanceViewModel.IsPageTypeSettings):
150152
UpdatePageType();
151153
break;
152154
case nameof(CurrentInstanceViewModel.IsGitRepository):
@@ -218,6 +220,7 @@ private void UpdatePageType()
218220
{ IsPageTypeCloudDrive: true } => ContentPageTypes.CloudDrive,
219221
{ IsPageTypeMtpDevice: true } => ContentPageTypes.MtpDevice,
220222
{ IsPageTypeSearchResults: true } => ContentPageTypes.SearchResults,
223+
{ IsPageTypeSettings: true } => ContentPageTypes.Settings,
221224
_ => ContentPageTypes.Folder,
222225
};
223226
SetProperty(ref pageType, type, nameof(PageType));
@@ -247,7 +250,9 @@ and not ContentPageTypes.Home
247250
and not ContentPageTypes.RecycleBin
248251
and not ContentPageTypes.ZipFolder
249252
and not ContentPageTypes.SearchResults
250-
and not ContentPageTypes.MtpDevice;
253+
and not ContentPageTypes.MtpDevice
254+
and not ContentPageTypes.ReleaseNotes
255+
and not ContentPageTypes.Settings;
251256
}
252257
}
253258
}

‎src/Files.App/Data/Contexts/ContentPage/ContentPageTypes.cs

+1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ public enum ContentPageTypes : ushort
1616
MtpDevice,
1717
SearchResults,
1818
ReleaseNotes,
19+
Settings,
1920
}
2021
}

‎src/Files.App/Data/Items/LocationItem.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public string Path
4949
Path.StartsWith("shell:", StringComparison.OrdinalIgnoreCase) ||
5050
Path.EndsWith(ShellLibraryItem.EXTENSION, StringComparison.OrdinalIgnoreCase) ||
5151
Path == "Home" ||
52-
Path == "ReleaseNotes"
52+
Path == "ReleaseNotes" ||
53+
Path == "Settings"
5354
? Text
5455
: Path;
5556
}

‎src/Files.App/Data/Models/CurrentInstanceViewModel.cs

+14-2
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,18 @@ public bool IsPageTypeReleaseNotes
6464
OnPropertyChanged(nameof(CanCopyPathInPage));
6565
}
6666
}
67+
68+
private bool isPageTypeSettings = false;
69+
public bool IsPageTypeSettings
70+
{
71+
get => isPageTypeSettings;
72+
set
73+
{
74+
SetProperty(ref isPageTypeSettings, value);
75+
OnPropertyChanged(nameof(CanCreateFileInPage));
76+
OnPropertyChanged(nameof(CanCopyPathInPage));
77+
}
78+
}
6779

6880
private bool isPageTypeMtpDevice = false;
6981
public bool IsPageTypeMtpDevice
@@ -136,12 +148,12 @@ public bool IsPageTypeLibrary
136148

137149
public bool CanCopyPathInPage
138150
{
139-
get => !isPageTypeMtpDevice && !isPageTypeRecycleBin && isPageTypeNotHome && !isPageTypeSearchResults;
151+
get => !isPageTypeMtpDevice && !isPageTypeRecycleBin && isPageTypeNotHome && !isPageTypeSearchResults && !IsPageTypeReleaseNotes && !IsPageTypeSettings;
140152
}
141153

142154
public bool CanCreateFileInPage
143155
{
144-
get => !isPageTypeMtpDevice && !isPageTypeRecycleBin && isPageTypeNotHome && !isPageTypeSearchResults && !isPageTypeFtp && !isPageTypeZipFolder;
156+
get => !isPageTypeMtpDevice && !isPageTypeRecycleBin && isPageTypeNotHome && !isPageTypeSearchResults && !isPageTypeFtp && !isPageTypeZipFolder && !IsPageTypeReleaseNotes && !IsPageTypeSettings;
145157
}
146158

147159
public bool CanTagFilesInPage

‎src/Files.App/Helpers/Navigation/NavigationHelpers.cs

+9
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,9 @@ private static async Task UpdateTabInfoAsync(TabBarItem tabItem, object navigati
159159
imageSource = new BitmapImage(new Uri(Constants.FluentIconsPaths.HomeIcon));
160160
else if (path == "ReleaseNotes")
161161
imageSource = new BitmapImage(new Uri(AppLifecycleHelper.AppIconPath));
162+
// TODO add settings page
163+
//else if (path == "Settings")
164+
// imageSource = new BitmapImage(new Uri(AppLifecycleHelper.AppIconPath));
162165
else if (WSLDistroManager.TryGetDistro(path, out WslDistroItem? wslDistro) && path.Equals(wslDistro.Path))
163166
imageSource = new BitmapImage(wslDistro.Icon);
164167
else
@@ -199,6 +202,12 @@ private static async Task UpdateTabInfoAsync(TabBarItem tabItem, object navigati
199202
tabLocationHeader = Strings.ReleaseNotes.GetLocalizedResource();
200203
iconSource.ImageSource = new BitmapImage(new Uri(AppLifecycleHelper.AppIconPath));
201204
}
205+
// TODO add settings page
206+
//else if (currentPath == "Settings")
207+
//{
208+
// tabLocationHeader = Strings.Settings.GetLocalizedResource();
209+
// iconSource.ImageSource = new BitmapImage(new Uri(AppLifecycleHelper.AppIconPath));
210+
//}
202211
else if (currentPath.Equals(Constants.UserEnvironmentPaths.DesktopPath, StringComparison.OrdinalIgnoreCase))
203212
tabLocationHeader = Strings.Desktop.GetLocalizedResource();
204213
else if (currentPath.Equals(Constants.UserEnvironmentPaths.DownloadsPath, StringComparison.OrdinalIgnoreCase))

‎src/Files.App/Utils/Shell/ShellHelpers.cs

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public static string GetShellNameFromPath(string shPath)
3030
{
3131
"Home" => Strings.Home.GetLocalizedResource(),
3232
"ReleaseNotes" => Strings.ReleaseNotes.GetLocalizedResource(),
33+
"Settings" => Strings.Settings.GetLocalizedResource(),
3334
Constants.UserEnvironmentPaths.RecycleBinPath => Strings.RecycleBin.GetLocalizedResource(),
3435
Constants.UserEnvironmentPaths.NetworkFolderPath => Strings.Network.GetLocalizedResource(),
3536
Constants.UserEnvironmentPaths.MyComputerPath => Strings.ThisPC.GetLocalizedResource(),

‎src/Files.App/Utils/Storage/Helpers/StorageFileExtensions.cs

+6
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ public static async Task<List<PathBoxItem>> GetDirectoryPathComponentsWithDispla
142142
item.Title = Strings.Home.GetLocalizedResource();
143143
if (item.Path == "ReleaseNotes")
144144
item.Title = Strings.ReleaseNotes.GetLocalizedResource();
145+
// TODO add settings page
146+
//if (item.Path == "Settings")
147+
// item.Title = Strings.Settings.GetLocalizedResource();
145148
else
146149
{
147150
BaseStorageFolder folder = await FilesystemTasks.Wrap(() => DangerousGetFolderFromPathAsync(item.Path));
@@ -345,6 +348,9 @@ private static string ResolvePath(string path, bool isFtp)
345348

346349
if (path.StartsWith("ReleaseNotes"))
347350
return "ReleaseNotes";
351+
352+
if (path.StartsWith("Settings"))
353+
return "Settings";
348354

349355
if (ShellStorageFolder.IsShellPath(path))
350356
return ShellHelpers.ResolveShellPath(path);

‎src/Files.App/ViewModels/MainPageViewModel.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,13 @@ public HorizontalAlignment AppThemeBackgroundImageHorizontalAlignment
102102
public bool ShowToolbar =>
103103
AppearanceSettingsService.ShowToolbar &&
104104
context.PageType is not ContentPageTypes.Home &&
105-
context.PageType is not ContentPageTypes.ReleaseNotes;
105+
context.PageType is not ContentPageTypes.ReleaseNotes &&
106+
context.PageType is not ContentPageTypes.Settings;
106107

107108
public bool ShowStatusBar =>
108109
context.PageType is not ContentPageTypes.Home &&
109-
context.PageType is not ContentPageTypes.ReleaseNotes;
110+
context.PageType is not ContentPageTypes.ReleaseNotes &&
111+
context.PageType is not ContentPageTypes.Settings;
110112

111113

112114
// Commands

‎src/Files.App/ViewModels/ShellViewModel.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public async Task SetWorkingDirectoryAsync(string? value)
197197
else if (!Path.IsPathRooted(WorkingDirectory) || Path.GetPathRoot(WorkingDirectory) != Path.GetPathRoot(value))
198198
workingRoot = await FilesystemTasks.Wrap(() => DriveHelpers.GetRootFromPathAsync(value));
199199

200-
if (value == "Home" || value == "ReleaseNotes")
200+
if (value == "Home" || value == "ReleaseNotes" || value == "Settings")
201201
currentStorageFolder = null;
202202
else
203203
_ = Task.Run(() => jumpListService.AddFolderAsync(value));
@@ -636,7 +636,7 @@ private async void FileTagsSettingsService_OnSettingUpdated(object? sender, Even
636636
{
637637
await dispatcherQueue.EnqueueOrInvokeAsync(() =>
638638
{
639-
if (WorkingDirectory != "Home" && WorkingDirectory != "ReleaseNotes")
639+
if (WorkingDirectory != "Home" && WorkingDirectory != "ReleaseNotes" && WorkingDirectory != "Settings")
640640
RefreshItems(null);
641641
});
642642
}
@@ -657,7 +657,7 @@ private async void UserSettingsService_OnSettingChangedEvent(object? sender, Set
657657
case nameof(UserSettingsService.FoldersSettingsService.SizeUnitFormat):
658658
await dispatcherQueue.EnqueueOrInvokeAsync(() =>
659659
{
660-
if (WorkingDirectory != "Home" && WorkingDirectory != "ReleaseNotes")
660+
if (WorkingDirectory != "Home" && WorkingDirectory != "ReleaseNotes" && WorkingDirectory != "Settings")
661661
RefreshItems(null);
662662
});
663663
break;
@@ -1899,7 +1899,7 @@ private void GetDesktopIniFileData()
18991899

19001900
public void CheckForBackgroundImage()
19011901
{
1902-
if (WorkingDirectory == "Home" || WorkingDirectory == "ReleaseNotes")
1902+
if (WorkingDirectory == "Home" || WorkingDirectory == "ReleaseNotes" || WorkingDirectory != "Settings")
19031903
{
19041904
FolderBackgroundImageSource = null;
19051905
return;

‎src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs

+13-4
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ public void PathBoxItem_DragLeave(object sender, DragEventArgs e)
347347
{
348348
if (((StackPanel)sender).DataContext is not PathBoxItem pathBoxItem ||
349349
pathBoxItem.Path == "Home" ||
350-
pathBoxItem.Path == "ReleaseNotes")
350+
pathBoxItem.Path == "ReleaseNotes" ||
351+
pathBoxItem.Path == "Settings")
351352
{
352353
return;
353354
}
@@ -369,7 +370,8 @@ public async Task PathBoxItem_Drop(object sender, DragEventArgs e)
369370

370371
if (((StackPanel)sender).DataContext is not PathBoxItem pathBoxItem ||
371372
pathBoxItem.Path == "Home" ||
372-
pathBoxItem.Path == "ReleaseNotes")
373+
pathBoxItem.Path == "ReleaseNotes" ||
374+
pathBoxItem.Path == "Settings")
373375
{
374376
return;
375377
}
@@ -399,7 +401,8 @@ public async Task PathBoxItem_DragOver(object sender, DragEventArgs e)
399401
if (IsSingleItemOverride ||
400402
((StackPanel)sender).DataContext is not PathBoxItem pathBoxItem ||
401403
pathBoxItem.Path == "Home" ||
402-
pathBoxItem.Path == "ReleaseNotes")
404+
pathBoxItem.Path == "ReleaseNotes" ||
405+
pathBoxItem.Path == "Settings")
403406
{
404407
return;
405408
}
@@ -765,6 +768,12 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.CommandNotExecutable.GetLocali
765768
SavePathToHistory("ReleaseNotes");
766769
shellPage.NavigateToReleaseNotes();
767770
}
771+
// TODO add settings page
772+
//else if (normalizedInput.Equals("Settings", StringComparison.OrdinalIgnoreCase) || normalizedInput.Equals(Strings.Settings.GetLocalizedResource(), StringComparison.OrdinalIgnoreCase))
773+
//{
774+
// SavePathToHistory("Settings");
775+
// shellPage.NavigateToReleaseNotes();
776+
//}
768777
else
769778
{
770779
normalizedInput = StorageFileExtensions.GetResolvedPath(normalizedInput, isFtp);
@@ -881,7 +890,7 @@ public async Task SetAddressBarSuggestionsAsync(AutoSuggestBox sender, IShellPag
881890
IsCommandPaletteOpen = false;
882891
var currentInput = sender.Text;
883892

884-
if (string.IsNullOrWhiteSpace(currentInput) || currentInput == "Home" || currentInput == "ReleaseNotes")
893+
if (string.IsNullOrWhiteSpace(currentInput) || currentInput == "Home" || currentInput == "ReleaseNotes" || currentInput == "Settings")
885894
{
886895
// Load previously entered path
887896
var pathHistoryList = UserSettingsService.GeneralSettingsService.PathHistoryList;

‎src/Files.App/ViewModels/UserControls/SidebarViewModel.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,8 @@ private async Task HandleLocationItemDragOverAsync(LocationItem locationItem, It
10991099
else if (isPathNull ||
11001100
(hasStorageItems && storageItems.AreItemsAlreadyInFolder(locationItem.Path)) ||
11011101
locationItem.Path.StartsWith("Home", StringComparison.OrdinalIgnoreCase) ||
1102-
locationItem.Path.StartsWith("ReleaseNotes", StringComparison.OrdinalIgnoreCase))
1102+
locationItem.Path.StartsWith("ReleaseNotes", StringComparison.OrdinalIgnoreCase) ||
1103+
locationItem.Path.StartsWith("Settings", StringComparison.OrdinalIgnoreCase))
11031104
{
11041105
rawEvent.AcceptedOperation = DataPackageOperation.None;
11051106
}

‎src/Files.App/Views/HomePage.xaml.cs

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
4343
AppInstance.InstanceViewModel.GitRepositoryPath = null;
4444
AppInstance.InstanceViewModel.IsGitRepository = false;
4545
AppInstance.InstanceViewModel.IsPageTypeReleaseNotes = false;
46+
AppInstance.InstanceViewModel.IsPageTypeSettings = false;
4647
AppInstance.ToolbarViewModel.CanRefresh = true;
4748
AppInstance.ToolbarViewModel.CanGoBack = AppInstance.CanNavigateBackward;
4849
AppInstance.ToolbarViewModel.CanGoForward = AppInstance.CanNavigateForward;

‎src/Files.App/Views/Layouts/BaseLayoutPage.cs

+2
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
442442
ParentShellPageInstance.InstanceViewModel.IsPageTypeLibrary = LibraryManager.IsLibraryPath(workingDir);
443443
ParentShellPageInstance.InstanceViewModel.IsPageTypeSearchResults = false;
444444
ParentShellPageInstance.InstanceViewModel.IsPageTypeReleaseNotes = false;
445+
ParentShellPageInstance.InstanceViewModel.IsPageTypeSettings = false;
445446
ParentShellPageInstance.ToolbarViewModel.PathControlDisplayText = navigationArguments.NavPathParam;
446447

447448
if (ParentShellPageInstance.InstanceViewModel.FolderSettings.DirectorySortOption == SortOption.Path)
@@ -476,6 +477,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
476477
ParentShellPageInstance.InstanceViewModel.IsPageTypeLibrary = LibraryManager.IsLibraryPath(workingDir);
477478
ParentShellPageInstance.InstanceViewModel.IsPageTypeSearchResults = true;
478479
ParentShellPageInstance.InstanceViewModel.IsPageTypeReleaseNotes = false;
480+
ParentShellPageInstance.InstanceViewModel.IsPageTypeSettings = false;
479481

480482
if (!navigationArguments.IsLayoutSwitch)
481483
{

0 commit comments

Comments
 (0)