Feature: Use DPI aware icons in the Details View

Author: yaira2

src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs

@@ -227,7 +227,13 @@ public uint GetRoundedIconSize()
 		{
 			return LayoutMode switch
 			{
-				FolderLayoutModes.DetailsView
+				_ when LayoutMode == FolderLayoutModes.DetailsView && UserSettingsService.LayoutSettingsService.DetailsViewSize <= DetailsViewSizeKind.Small
+					=> Constants.ShellIconSizes.Small,
+				_ when LayoutMode == FolderLayoutModes.DetailsView && UserSettingsService.LayoutSettingsService.DetailsViewSize == DetailsViewSizeKind.Medium
+					=> 20,
+				_ when LayoutMode == FolderLayoutModes.DetailsView && UserSettingsService.LayoutSettingsService.DetailsViewSize == DetailsViewSizeKind.Large
+					=> 24,
+				_ when LayoutMode == FolderLayoutModes.DetailsView && UserSettingsService.LayoutSettingsService.DetailsViewSize == DetailsViewSizeKind.ExtraLarge
 					=> Constants.ShellIconSizes.Large,
 				FolderLayoutModes.ListView
 					=> Constants.ShellIconSizes.Large,

src/Files.App/ViewModels/ShellViewModel.cs

@@ -975,6 +975,7 @@ private async Task LoadThumbnailAsync(ListedItem item, CancellationToken cancell
 			var loadNonCachedThumbnail = false;
 			var thumbnailSize = folderSettings.GetRoundedIconSize();
 			var returnIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false || thumbnailSize < 48;
+			var useCurrentScale = folderSettings.LayoutMode == FolderLayoutModes.DetailsView;
 
 			byte[]? result = null;
 
@@ -988,7 +989,7 @@ private async Task LoadThumbnailAsync(ListedItem item, CancellationToken cancell
 							item.ItemPath,
 							thumbnailSize,
 							item.IsFolder,
-							IconOptions.ReturnThumbnailOnly | IconOptions.ReturnOnlyIfCached);
+							IconOptions.ReturnThumbnailOnly | IconOptions.ReturnOnlyIfCached | (useCurrentScale ? IconOptions.UseCurrentScale : 0));
 
 					cancellationToken.ThrowIfCancellationRequested();
 					loadNonCachedThumbnail = true;
@@ -1001,7 +1002,7 @@ private async Task LoadThumbnailAsync(ListedItem item, CancellationToken cancell
 							item.ItemPath,
 							thumbnailSize,
 							item.IsFolder,
-							IconOptions.ReturnIconOnly);
+							IconOptions.ReturnIconOnly | (useCurrentScale ? IconOptions.UseCurrentScale : 0));
 
 					cancellationToken.ThrowIfCancellationRequested();
 				}
@@ -1013,7 +1014,7 @@ private async Task LoadThumbnailAsync(ListedItem item, CancellationToken cancell
 						item.ItemPath,
 						thumbnailSize,
 						item.IsFolder,
-						returnIconOnly ? IconOptions.ReturnIconOnly : IconOptions.None);
+						returnIconOnly ? IconOptions.ReturnIconOnly | (useCurrentScale ? IconOptions.UseCurrentScale : 0) : (useCurrentScale ? IconOptions.UseCurrentScale : 0));
 
 				cancellationToken.ThrowIfCancellationRequested();
 			}
@@ -1059,7 +1060,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 								item.ItemPath,
 								thumbnailSize,
 								item.IsFolder,
-								IconOptions.ReturnThumbnailOnly);
+								IconOptions.ReturnThumbnailOnly | (useCurrentScale ? IconOptions.UseCurrentScale : 0));
 					}
 					finally
 					{

src/Files.App/Views/Layouts/DetailsLayoutPage.xaml

@@ -903,13 +903,16 @@
 									Loaded="StackPanel_Loaded"
 									Orientation="Horizontal">
 									<!--  Item Thumbnail  -->
-									<Grid HorizontalAlignment="Left" VerticalAlignment="Stretch">
+									<Grid
+										Width="{Binding ColumnsViewModel.IconColumn.Length.Value, ElementName=PageRoot, Mode=OneWay}"
+										HorizontalAlignment="Left"
+										VerticalAlignment="Stretch">
 
 										<!--  Thumbnail  -->
 										<Grid
 											x:Name="IconBox"
-											Width="24"
-											Height="24"
+											Width="{Binding ColumnsViewModel.IconColumn.Length.Value, ElementName=PageRoot, Mode=OneWay}"
+											Height="{Binding ColumnsViewModel.IconColumn.Length.Value, ElementName=PageRoot, Mode=OneWay}"
 											HorizontalAlignment="Center"
 											VerticalAlignment="Center"
 											AutomationProperties.Name="{helpers:ResourceString Name=FileBrowserThumbnailIconColumnGrid/AutomationProperties/Name}"
@@ -918,8 +921,7 @@
 											Tag="ItemImage">
 											<ContentPresenter
 												x:Name="PicturePresenter"
-												Width="20"
-												Height="20"
+												Margin="2"
 												HorizontalAlignment="Center"
 												VerticalAlignment="Center"
 												x:Load="{x:Bind LoadFileIcon, Mode=OneWay}"

src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs

@@ -29,6 +29,7 @@ public sealed partial class DetailsLayoutPage : BaseGroupableLayoutPage
 		// Fields
 
 		private ListedItem? _nextItemToSelect;
+		private uint currentIconSize;
 
 		// Properties
 
@@ -136,6 +137,8 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 
 			base.OnNavigatedTo(eventArgs);
 
+			currentIconSize = FolderSettings.GetRoundedIconSize();
+
 			if (FolderSettings?.ColumnsViewModel is not null)
 			{
 				ColumnsViewModel.DateCreatedColumn = FolderSettings.ColumnsViewModel.DateCreatedColumn;
@@ -191,7 +194,7 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
 			UserSettingsService.LayoutSettingsService.PropertyChanged -= LayoutSettingsService_PropertyChanged;
 		}
 
-		private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+		private async void LayoutSettingsService_PropertyChanged(object? sender, PropertyChangedEventArgs e)
 		{
 			if (e.PropertyName == nameof(ILayoutSettingsService.DetailsViewSize))
 			{
@@ -205,6 +208,14 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
 
 				// Restore correct scroll position
 				ContentScroller?.ChangeView(null, previousOffset, null);
+
+				// Reload icons with correct size but only if the size changed
+				var requestedIconSize = FolderSettings.GetRoundedIconSize();
+				if (requestedIconSize != currentIconSize)
+				{
+					currentIconSize = requestedIconSize;
+					_ = ReloadItemIconsAsync();
+				}
 			}
 			else
 			{
@@ -255,6 +266,19 @@ private void SetItemContainerStyle()
 				// Set correct style
 				FileList.ItemContainerStyle = RegularItemContainerStyle;
 			}
+
+			// Set icon column width
+			var iconColumnWidth = UserSettingsService.LayoutSettingsService.DetailsViewSize switch
+			{
+				DetailsViewSizeKind.Compact => new GridLength(20),
+				DetailsViewSizeKind.Small => new GridLength(20),
+				DetailsViewSizeKind.Medium => new GridLength(24),
+				DetailsViewSizeKind.Large => new GridLength(28),
+				DetailsViewSizeKind.ExtraLarge => new GridLength(36),
+				_ => new GridLength(20)
+			};
+
+			ColumnsViewModel.IconColumn.UserLength = iconColumnWidth;
 		}
 
 		private void FileList_LayoutUpdated(object? sender, object e)

src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs

@@ -140,7 +140,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 
 			var parameters = (NavigationArguments)eventArgs.Parameter;
 			if (parameters.IsLayoutSwitch)
-				ReloadItemIconsAsync();
+				_ = ReloadItemIconsAsync();
 		}
 
 		protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
@@ -204,7 +204,7 @@ private async void FolderSettings_LayoutModeChangeRequested(object? sender, Layo
 				if (requestedIconSize != currentIconSize)
 				{
 					currentIconSize = requestedIconSize;
-					await ReloadItemIconsAsync();
+					_ = ReloadItemIconsAsync();
 				}
 			}
 		}
@@ -497,7 +497,7 @@ private async void FolderSettings_IconHeightChanged()
 			{
 				// Update icon size before refreshing
 				currentIconSize = requestedIconSize;
-				await ReloadItemIconsAsync();
+				_ = ReloadItemIconsAsync();
 			}
 		}