Code Quality: Return icon size based on current layout settings (#14650)

files-community · Feb 6, 2024 · bb026d9 · bb026d9
1 parent a06aafc
commit bb026d9
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 21 deletions.
diff --git a/src/Files.App/Data/Models/ItemViewModel.cs b/src/Files.App/Data/Models/ItemViewModel.cs
@@ -1445,7 +1445,7 @@ private async Task RapidAddItemsToCollectionAsync(string? path, LibraryItem? lib
 					break;
 			}
 
-			await GetDefaultItemIconsAsync(folderSettings.GetIconSize());
+			await GetDefaultItemIconsAsync(folderSettings.GetRoundedIconSize());
 
 			if (IsLoadingCancelled)
 			{

diff --git a/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs b/src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs
@@ -40,6 +40,7 @@ public bool IsAdaptiveLayoutEnabled
 			}
 		}
 
+		[Obsolete("Don't add more references, we're working on removing this property")]
 		public int GridViewSize
 		{
 			get => LayoutPreferencesItem.IconSizeGridView;
@@ -317,7 +318,25 @@ public LayoutPreferencesManager(FolderLayoutModes modeOverride) : this()
 
 		// Methods
 
-		public uint GetIconSize()
+		/// <summary>
+		/// This will round the current icon size to get the best result from the File Explorer thumbnail system.
+		/// 
+		/// Details View:
+		///		Always uses the Large icon size (32).
+		///		
+		/// List View:
+		///		Always uses the Large icon size (32).
+		///		
+		/// Columns View:
+		///		Always uses the Large icon size (32).
+		///		
+		/// Tiles View:
+		///		Uses a range of icon sizes (64, 72, 96, 128, 180, 256) depending on the selected icon size.
+		///		
+		/// Grid View:
+		///		Uses a range of icon sizes (64, 72, 96, 128, 180, 256) depending on the selected icon size.
+		/// </summary>
+		public uint GetRoundedIconSize()
 		{
 			return LayoutMode switch
 			{
@@ -327,17 +346,20 @@ public uint GetIconSize()
 					=> Constants.DefaultIconSizes.Large,
 				FolderLayoutModes.ColumnView
 					=> Constants.DefaultIconSizes.Large,
-				FolderLayoutModes.TilesView
-					=> Constants.Browser.GridViewBrowser.TilesView,
-				_ when GridViewSize <= 64
+				_ when LayoutMode == FolderLayoutModes.TilesView && LayoutPreferencesItem.IconSizeTilesView <= 64 ||
+					   LayoutMode == FolderLayoutModes.GridView && LayoutPreferencesItem.IconSizeGridView <= 64
 					=> 64,
-				_ when GridViewSize <= 72
+				_ when LayoutMode == FolderLayoutModes.TilesView && LayoutPreferencesItem.IconSizeTilesView <= 72 ||
+					   LayoutMode == FolderLayoutModes.GridView && LayoutPreferencesItem.IconSizeGridView <= 72
 					=> 72,
-				_ when GridViewSize <= 96
+				_ when LayoutMode == FolderLayoutModes.TilesView && LayoutPreferencesItem.IconSizeTilesView <= 96 ||
+					   LayoutMode == FolderLayoutModes.GridView && LayoutPreferencesItem.IconSizeGridView <= 96
 					=> 96,
-				_ when GridViewSize <= 128
+				_ when LayoutMode == FolderLayoutModes.TilesView && LayoutPreferencesItem.IconSizeTilesView <= 128 ||
+					   LayoutMode == FolderLayoutModes.GridView && LayoutPreferencesItem.IconSizeGridView <= 128
 					=> 128,
-				_ when GridViewSize <= 180
+				_ when LayoutMode == FolderLayoutModes.TilesView && LayoutPreferencesItem.IconSizeTilesView <= 180 ||
+					   LayoutMode == FolderLayoutModes.GridView && LayoutPreferencesItem.IconSizeGridView <= 180
 					=> 180,
 				_ => 256,
 			};

diff --git a/src/Files.App/ViewModels/UserControls/ToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/ToolbarViewModel.cs
@@ -957,9 +957,9 @@ private void FolderSettings_PropertyChanged(object? sender, PropertyChangedEvent
 						FolderLayoutModes.TilesView => Commands.LayoutTiles.OpacityStyle!,
 						FolderLayoutModes.ColumnView => Commands.LayoutColumns.OpacityStyle!,
 						FolderLayoutModes.GridView =>
-							instanceViewModel.FolderSettings.GridViewSize <= Constants.Browser.GridViewBrowser.GridViewSizeSmall
+							instanceViewModel.FolderSettings.LayoutPreferencesItem.IconSizeGridView <= Constants.Browser.GridViewBrowser.GridViewSizeSmall
 								? Commands.LayoutGridSmall.OpacityStyle!
-								: instanceViewModel.FolderSettings.GridViewSize <= Constants.Browser.GridViewBrowser.GridViewSizeMedium
+								: instanceViewModel.FolderSettings.LayoutPreferencesItem.IconSizeGridView <= Constants.Browser.GridViewBrowser.GridViewSizeMedium
 									? Commands.LayoutGridMedium.OpacityStyle!
 									: Commands.LayoutGridLarge.OpacityStyle!,
 						_ => Commands.LayoutDetails.OpacityStyle!
@@ -1021,8 +1021,8 @@ public List<ListedItem> SelectedItems
 
 		public bool IsTilesLayout => instanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.TilesView;
 		public bool IsColumnLayout => instanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.ColumnView;
-		public bool IsGridSmallLayout => instanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.GridView && instanceViewModel.FolderSettings.GridViewSize <= Constants.Browser.GridViewBrowser.GridViewSizeSmall;
-		public bool IsGridMediumLayout => instanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.GridView && !IsGridSmallLayout && instanceViewModel.FolderSettings.GridViewSize <= Constants.Browser.GridViewBrowser.GridViewSizeMedium;
+		public bool IsGridSmallLayout => instanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.GridView && instanceViewModel.FolderSettings.LayoutPreferencesItem.IconSizeGridView <= Constants.Browser.GridViewBrowser.GridViewSizeSmall;
+		public bool IsGridMediumLayout => instanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.GridView && !IsGridSmallLayout && instanceViewModel.FolderSettings.LayoutPreferencesItem.IconSizeGridView <= Constants.Browser.GridViewBrowser.GridViewSizeMedium;
 		public bool IsGridLargeLayout => instanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.GridView && !IsGridSmallLayout && !IsGridMediumLayout;
 		public bool IsDetailsLayout => !IsListLayout && !IsTilesLayout && !IsColumnLayout && !IsGridSmallLayout && !IsGridMediumLayout && !IsGridLargeLayout;
 		public bool IsListLayout => instanceViewModel.FolderSettings.LayoutMode is FolderLayoutModes.ListView;

diff --git a/src/Files.App/Views/Layouts/BaseLayoutPage.cs b/src/Files.App/Views/Layouts/BaseLayoutPage.cs
@@ -467,7 +467,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 					{
 						Query = navigationArguments.SearchQuery,
 						Folder = navigationArguments.SearchPathParam,
-						ThumbnailSize = InstanceViewModel!.FolderSettings.GetIconSize(),
+						ThumbnailSize = InstanceViewModel!.FolderSettings.GetRoundedIconSize(),
 					};
 
 					_ = ParentShellPageInstance.FilesystemViewModel.SearchAsync(searchInstance);

diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs
@@ -132,7 +132,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 
 			ParentShellPageInstance.FilesystemViewModel.EnabledGitProperties = GetEnabledGitProperties(ColumnsViewModel);
 
-			currentIconSize = FolderSettings.GetIconSize();
+			currentIconSize = FolderSettings.GetRoundedIconSize();
 			FolderSettings.LayoutModeChangeRequested += FolderSettings_LayoutModeChangeRequested;
 			FolderSettings.GridViewSizeChangeRequested += FolderSettings_GridViewSizeChangeRequested;
 			FolderSettings.GroupOptionPreferenceUpdated += ZoomIn;
@@ -414,7 +414,7 @@ protected override bool CanGetItemFromElement(object element)
 
 		private async void FolderSettings_GridViewSizeChangeRequested(object? sender, EventArgs e)
 		{
-			var requestedIconSize = FolderSettings.GetIconSize(); // Get new icon size
+			var requestedIconSize = FolderSettings.GetRoundedIconSize(); // Get new icon size
 
 			// Prevents reloading icons when the icon size hasn't changed
 			if (requestedIconSize != currentIconSize)

diff --git a/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs
@@ -39,7 +39,7 @@ public sealed partial class GridLayoutPage : BaseGroupableLayoutPage
 			FolderSettings.LayoutMode == FolderLayoutModes.ListView ||
 			FolderSettings.LayoutMode == FolderLayoutModes.TilesView
 				? 260
-				: FolderSettings.GridViewSize;
+				: FolderSettings.LayoutPreferencesItem.IconSizeGridView;
 
 		public bool IsPointerOver
 		{
@@ -104,7 +104,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 
 			base.OnNavigatedTo(eventArgs);
 
-			currentIconSize = FolderSettings.GetIconSize();
+			currentIconSize = FolderSettings.GetRoundedIconSize();
 			FolderSettings.GroupOptionPreferenceUpdated -= ZoomIn;
 			FolderSettings.GroupOptionPreferenceUpdated += ZoomIn;
 			FolderSettings.LayoutModeChangeRequested -= FolderSettings_LayoutModeChangeRequested;
@@ -148,7 +148,7 @@ private async void FolderSettings_LayoutModeChangeRequested(object? sender, Layo
 				// Set ItemTemplate
 				SetItemTemplate();
 
-				var requestedIconSize = FolderSettings.GetIconSize();
+				var requestedIconSize = FolderSettings.GetRoundedIconSize();
 				if (requestedIconSize != currentIconSize)
 				{
 					currentIconSize = requestedIconSize;
@@ -446,7 +446,7 @@ private async void FolderSettings_GridViewSizeChangeRequested(object? sender, Ev
 			SetItemMinWidth();
 
 			// Get new icon size
-			var requestedIconSize = FolderSettings.GetIconSize();
+			var requestedIconSize = FolderSettings.GetRoundedIconSize();
 
 			// Prevents reloading icons when the icon size hasn't changed
 			if (requestedIconSize != currentIconSize)

diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
@@ -557,7 +557,7 @@ public async Task Refresh_Click()
 				{
 					Query = InstanceViewModel.CurrentSearchQuery ?? (string)TabItemParameter.NavigationParameter,
 					Folder = FilesystemViewModel.WorkingDirectory,
-					ThumbnailSize = InstanceViewModel.FolderSettings.GetIconSize(),
+					ThumbnailSize = InstanceViewModel.FolderSettings.GetRoundedIconSize(),
 				};
 
 				await FilesystemViewModel.SearchAsync(searchInstance);