Fix: Use correct DPI settings when requesting icons (#14779)

Author: yaira2

src/Files.App/Data/Items/DriveItem.cs

@@ -317,7 +317,7 @@ public int CompareTo(INavigationControlItem other)
 public async Task LoadThumbnailAsync()
 {
 if (!string.IsNullOrEmpty(DeviceID) && !string.Equals(DeviceID, "network-folder"))
-IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, Constants.ShellIconSizes.Large, false, false, true);
+IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, Constants.ShellIconSizes.Small, false, false, true, true);
 
 if (Root is not null)
 {

src/Files.App/Data/Items/SidebarLibraryItem.cs

@@ -46,7 +46,7 @@ public async Task<bool> CheckDefaultSaveFolderAccess()
 
 public async Task LoadLibraryIconAsync()
 {
-IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.ShellIconSizes.Large, false, false, true);
+IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.ShellIconSizes.Small, false, false, true, true);
 
 if (IconData is not null)
 Icon = await IconData.ToBitmapAsync();

src/Files.App/Data/Items/WidgetDriveCardItem.cs

@@ -26,7 +26,7 @@ public WidgetDriveCardItem(DriveItem item)
 
 public async Task LoadCardThumbnailAsync()
 {
-thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.Path, Constants.ShellIconSizes.Jumbo, true, false, true);
+thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.Path, Constants.ShellIconSizes.Large, true, false, true, true);
 
 // Thumbnail data is valid, set the item icon
 if (thumbnailData is not null && thumbnailData.Length > 0)

src/Files.App/Data/Items/WidgetFolderCardItem.cs

@@ -50,7 +50,7 @@ public WidgetFolderCardItem(LocationItem item, string text, bool isPinned)
 
 public async Task LoadCardThumbnailAsync()
 {
-_thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.ShellIconSizes.Jumbo, true, false, true);
+_thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.ShellIconSizes.Large, true, false, true, true);
 
 if (_thumbnailData is not null && _thumbnailData.Length > 0)
 Thumbnail = await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => _thumbnailData.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);

src/Files.App/Data/Models/AppModel.cs

@@ -116,5 +116,13 @@ public string PCloudDrivePath
 get => pCloudDrivePath;
 set => SetProperty(ref pCloudDrivePath, value);
 }
+
+/// <summary>
+/// Gets or sets a value indicating the AppWindow DPI.
+/// </summary>
+public float AppWindowDpi
+{
+get => InteropHelpers.GetDpiForWindow(MainWindow.Instance.WindowHandle) / 96f;
+}
 }
 }

src/Files.App/Data/Models/ItemViewModel.cs

@@ -1288,7 +1288,7 @@ await SafetyExtensions.IgnoreExceptions(() =>
 ImageSource? groupImage = null;
 if (item.PrimaryItemAttribute != StorageItemTypes.Folder || item.IsArchive)
 {
-var headerIconInfo = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.ItemPath, Constants.ShellIconSizes.ExtraLarge, false, false, true);
+var headerIconInfo = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.ItemPath, Constants.ShellIconSizes.Large, false, false, true, true);
 
 if (headerIconInfo is not null && !item.IsShortcut)
 groupImage = await dispatcherQueue.EnqueueOrInvokeAsync(() => headerIconInfo.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);

src/Files.App/Data/Models/SidebarPinnedModel.cs

@@ -102,7 +102,7 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)
 locationItem.IsInvalid = false;
 if (res && res.Result is not null)
 {
-var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(res.Result.Path, 28u, true, false, true);
+var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(res.Result.Path, Constants.ShellIconSizes.Small, true, false, true, true);
 locationItem.IconData = iconData;
 
 if (locationItem.IconData is not null)

src/Files.App/Helpers/Interop/InteropHelpers.cs

@@ -32,6 +32,9 @@ public static class InteropHelpers
 [DllImport("user32.dll", SetLastError = true)]
 public static extern void SwitchToThisWindow(IntPtr hWnd, bool altTab);
 
+[DllImport("User32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+public static extern int GetDpiForWindow(IntPtr hwnd);
+
 [DllImport("ole32.dll")]
 public static extern uint CoWaitForMultipleObjects(uint dwFlags, uint dwMilliseconds, ulong nHandles, IntPtr[] pHandles, out uint dwIndex);
 

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

@@ -188,7 +188,7 @@ private static async Task UpdateTabInfoAsync(TabBarItem tabItem, object navigati
 
 if (iconSource.ImageSource is null)
 {
-var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(currentPath, 28u, true, false, true);
+var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(currentPath, Constants.ShellIconSizes.Small, true, false, true, true);
 if (iconData is not null)
 iconSource.ImageSource = await iconData.ToBitmapAsync();
 }

src/Files.App/UserControls/Widgets/DrivesWidget.xaml

@@ -62,6 +62,8 @@
 <Image
 Grid.RowSpan="3"
 Grid.Column="0"
+Width="32"
+Height="32"
 HorizontalAlignment="Center"
 VerticalAlignment="Center"
 x:Phase="1"