diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw index c829bb40622f..44e092e40155 100644 --- a/src/Files.App/Strings/en-US/Resources.resw +++ b/src/Files.App/Strings/en-US/Resources.resw @@ -3508,7 +3508,7 @@ Cloning {0} from "{1}" to "{2}" Shown in a StatusCenter card. - + Canceled installing {0} fonts Shown in a StatusCenter card. @@ -3540,7 +3540,7 @@ Installing {0} font(s) from "{1}" Shown in a StatusCenter card. - + Canceled copying {0} item(s) to "{1}" Shown in a StatusCenter card. @@ -4193,4 +4193,10 @@ Enable Omnibar + + Sections hidden + + + You can add the sections back by right-clicking the sidebar area and selecting the sections you want to add. + \ No newline at end of file diff --git a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs index dafd4cb579b3..37c13ec64a7e 100644 --- a/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs +++ b/src/Files.App/ViewModels/UserControls/SidebarViewModel.cs @@ -59,6 +59,7 @@ public SidebarDisplayMode SidebarDisplayMode if (SetProperty(ref sidebarDisplayMode, value)) { OnPropertyChanged(nameof(IsSidebarCompactSize)); + OnPropertyChanged(nameof(AreSectionsHidden)); IsSidebarOpen = sidebarDisplayMode == SidebarDisplayMode.Expanded; UpdateTabControlMargin(); } @@ -134,6 +135,16 @@ public bool IsSidebarOpen } } + public bool AreSectionsHidden => + !ShowPinnedFoldersSection && + !ShowLibrarySection && + !ShowDrivesSection && + !ShowCloudDrivesSection && + !ShowNetworkSection && + (!ShowWslSection || WSLDistroManager.Distros.Any() == false) && + !ShowFileTagsSection && + SidebarDisplayMode is not SidebarDisplayMode.Compact; + public bool ShowPinnedFoldersSection { get => UserSettingsService.GeneralSettingsService.ShowPinnedSection; @@ -635,30 +646,37 @@ private async void UserSettingsService_OnSettingChangedEvent(object sender, Sett case nameof(UserSettingsService.GeneralSettingsService.ShowPinnedSection): await UpdateSectionVisibilityAsync(SectionType.Pinned, ShowPinnedFoldersSection); OnPropertyChanged(nameof(ShowPinnedFoldersSection)); + OnPropertyChanged(nameof(AreSectionsHidden)); break; case nameof(UserSettingsService.GeneralSettingsService.ShowLibrarySection): await UpdateSectionVisibilityAsync(SectionType.Library, ShowLibrarySection); OnPropertyChanged(nameof(ShowLibrarySection)); + OnPropertyChanged(nameof(AreSectionsHidden)); break; case nameof(UserSettingsService.GeneralSettingsService.ShowCloudDrivesSection): await UpdateSectionVisibilityAsync(SectionType.CloudDrives, ShowCloudDrivesSection); OnPropertyChanged(nameof(ShowCloudDrivesSection)); + OnPropertyChanged(nameof(AreSectionsHidden)); break; case nameof(UserSettingsService.GeneralSettingsService.ShowDrivesSection): await UpdateSectionVisibilityAsync(SectionType.Drives, ShowDrivesSection); OnPropertyChanged(nameof(ShowDrivesSection)); + OnPropertyChanged(nameof(AreSectionsHidden)); break; case nameof(UserSettingsService.GeneralSettingsService.ShowNetworkSection): await UpdateSectionVisibilityAsync(SectionType.Network, ShowNetworkSection); OnPropertyChanged(nameof(ShowNetworkSection)); + OnPropertyChanged(nameof(AreSectionsHidden)); break; case nameof(UserSettingsService.GeneralSettingsService.ShowWslSection): await UpdateSectionVisibilityAsync(SectionType.WSL, ShowWslSection); OnPropertyChanged(nameof(ShowWslSection)); + OnPropertyChanged(nameof(AreSectionsHidden)); break; case nameof(UserSettingsService.GeneralSettingsService.ShowFileTagsSection): await UpdateSectionVisibilityAsync(SectionType.FileTag, ShowFileTagsSection); OnPropertyChanged(nameof(ShowFileTagsSection)); + OnPropertyChanged(nameof(AreSectionsHidden)); break; } } diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml index 9cc2f82fb00d..d894999baeea 100644 --- a/src/Files.App/Views/MainPage.xaml +++ b/src/Files.App/Views/MainPage.xaml @@ -261,6 +261,12 @@ + +