Fix: Fixed issue where exe icons were sometimes small (#14700)

yaira2 · web-flow · commit fda8163ec9c4 · 2024-02-11T13:04:49.000-08:00
diff --git a/src/Files.App/Data/Items/DriveItem.cs b/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.DefaultIconSizes.Large, false, true);
+				IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, Constants.DefaultIconSizes.Large, false, false, true);
 
 			if (Root is not null)
 			{
diff --git a/src/Files.App/Data/Items/SidebarLibraryItem.cs b/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.DefaultIconSizes.Large, false, true);
+			IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.DefaultIconSizes.Large, false, false, true);
 
 			if (IconData is not null)
 				Icon = await IconData.ToBitmapAsync();
diff --git a/src/Files.App/Data/Items/WidgetDriveCardItem.cs b/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.DefaultIconSizes.Jumbo, true, true);
+			thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.Path, Constants.DefaultIconSizes.Jumbo, true, false, true);
 
 			// Thumbnail data is valid, set the item icon
 			if (thumbnailData is not null && thumbnailData.Length > 0)
diff --git a/src/Files.App/Data/Items/WidgetFolderCardItem.cs b/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.DefaultIconSizes.Jumbo, true, true);
+			_thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.DefaultIconSizes.Jumbo, true, false, true);
 
 			if (_thumbnailData is not null && _thumbnailData.Length > 0)
 				Thumbnail = await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => _thumbnailData.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
diff --git a/src/Files.App/Data/Models/ItemViewModel.cs b/src/Files.App/Data/Models/ItemViewModel.cs
@@ -948,7 +948,8 @@ private async Task LoadItemThumbnailAsync(ListedItem item, uint thumbnailSize =
 			if (item.IsLibrary || item.PrimaryItemAttribute == StorageItemTypes.File || item.IsArchive)
 			{
 				var getIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false;
-				var iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, getIconOnly);
+				var getThumbnailOnly = !item.IsExecutable && !getIconOnly;
+				var iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, getThumbnailOnly, getIconOnly);
 
 				if (!iconInfo.isIconCached)
 				{
@@ -965,7 +966,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 					var cancellationTokenSource = new CancellationTokenSource(3000);
 					while (!iconInfo.isIconCached)
 					{
-						iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, getIconOnly);
+						iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, getThumbnailOnly, getIconOnly);
 						cancellationTokenSource.Token.ThrowIfCancellationRequested();
 						await Task.Delay(500);
 					}
@@ -987,7 +988,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 							!item.IsExecutable
 						)
 						{
-							var fileIcon = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, true);
+							var fileIcon = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, false, true);
 							var bitmapImage = await fileIcon.IconData.ToBitmapAsync();
 							DefaultIcons.TryAdd(item.FileExtension.ToLowerInvariant(), bitmapImage);
 						}
@@ -1008,7 +1009,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
 			else
 			{
 				var getIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false || thumbnailSize < 80;
-				var iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, true, getIconOnly);
+				var iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, true, false, getIconOnly);
 
 				if (iconInfo.IconData is not null)
 				{
@@ -1287,7 +1288,7 @@ await SafetyExtensions.IgnoreExceptions(() =>
 			ImageSource? groupImage = null;
 			if (item.PrimaryItemAttribute != StorageItemTypes.Folder || item.IsArchive)
 			{
-				var headerIconInfo = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.ItemPath, Constants.DefaultIconSizes.ExtraLarge, false, true);
+				var headerIconInfo = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.ItemPath, Constants.DefaultIconSizes.ExtraLarge, false, false, true);
 
 				if (headerIconInfo is not null && !item.IsShortcut)
 					groupImage = await dispatcherQueue.EnqueueOrInvokeAsync(() => headerIconInfo.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
diff --git a/src/Files.App/Data/Models/SidebarPinnedModel.cs b/src/Files.App/Data/Models/SidebarPinnedModel.cs
@@ -111,7 +111,7 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)
 
 				if (locationItem.IconData is null)
 				{
-					locationItem.IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(path, 48u, false, true);
+					locationItem.IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(path, 48u, false, false, true);
 
 					if (locationItem.IconData is not null)
 						locationItem.Icon = await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => locationItem.IconData.ToBitmapAsync());
diff --git a/src/Files.App/Utils/Cloud/CloudDrivesManager.cs b/src/Files.App/Utils/Cloud/CloudDrivesManager.cs
@@ -63,7 +63,7 @@ public static async Task UpdateDrivesAsync()
 					ShowProperties = true,
 				};
 
-				var iconData = provider.IconData ?? await FileThumbnailHelper.LoadIconWithoutOverlayAsync(provider.SyncFolder, Constants.DefaultIconSizes.Large, false, true);
+				var iconData = provider.IconData ?? await FileThumbnailHelper.LoadIconWithoutOverlayAsync(provider.SyncFolder, Constants.DefaultIconSizes.Large, false, false, true);
 				if (iconData is not null)
 				{
 					cloudProviderItem.IconData = iconData;
diff --git a/src/Files.App/Utils/RecentItem/RecentItem.cs b/src/Files.App/Utils/RecentItem/RecentItem.cs
@@ -75,7 +75,7 @@ public RecentItem(ShellFileItem fileItem) : base()
 
 		public async Task LoadRecentItemIconAsync()
 		{
-			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(RecentPath, Constants.DefaultIconSizes.Large, false, false);
+			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(RecentPath, Constants.DefaultIconSizes.Large, false, false, false);
 			if (iconData is not null)
 			{
 				EmptyImgVis = false;
diff --git a/src/Files.App/Utils/Shell/Win32API.cs b/src/Files.App/Utils/Shell/Win32API.cs
@@ -246,6 +246,7 @@ public static (byte[]? icon, byte[]? overlay, bool isIconCached) GetFileIconAndO
 			string path,
 			int thumbnailSize,
 			bool isFolder,
+			bool getThumbnailOnly,
 			bool getIconOnly,
 			bool getOverlay = true,
 			bool onlyGetOverlay = false)
@@ -280,7 +281,7 @@ public static (byte[]? icon, byte[]? overlay, bool isIconCached) GetFileIconAndO
 
 					if (getIconOnly)
 						flags |= Shell32.SIIGBF.SIIGBF_ICONONLY;
-					else if (!isFolder)
+					else if (getThumbnailOnly)
 						flags |= Shell32.SIIGBF.SIIGBF_THUMBNAILONLY;
 
 					var hres = shellFactory.GetImage(new SIZE(thumbnailSize, thumbnailSize), flags, out var hbitmap);
diff --git a/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs b/src/Files.App/Utils/Storage/Helpers/FileThumbnailHelper.cs
@@ -9,12 +9,12 @@ namespace Files.App.Utils.Storage
 {
 	public static class FileThumbnailHelper
 	{
-		public static Task<(byte[] IconData, byte[] OverlayData, bool isIconCached)> LoadIconAndOverlayAsync(string filePath, uint thumbnailSize, bool isFolder = false, bool getIconOnly = false)
-			=> Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(filePath, (int)thumbnailSize, isFolder, getIconOnly));
+		public static Task<(byte[] IconData, byte[] OverlayData, bool isIconCached)> LoadIconAndOverlayAsync(string filePath, uint thumbnailSize, bool isFolder = false, bool getThumbnailOnly = false, bool getIconOnly = false)
+			=> Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(filePath, (int)thumbnailSize, isFolder, getThumbnailOnly, getIconOnly));
 
-		public static async Task<byte[]> LoadIconWithoutOverlayAsync(string filePath, uint thumbnailSize, bool isFolder, bool getIconOnly)
+		public static async Task<byte[]> LoadIconWithoutOverlayAsync(string filePath, uint thumbnailSize, bool isFolder, bool getThumbnailOnly, bool getIconOnly)
 		{
-			return (await Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(filePath, (int)thumbnailSize, isFolder, getIconOnly))).icon;
+			return (await Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(filePath, (int)thumbnailSize, isFolder, getThumbnailOnly, getIconOnly))).icon;
 		}
 
 		public static async Task<byte[]> LoadIconFromStorageItemAsync(IStorageItem item, uint thumbnailSize, ThumbnailMode thumbnailMode, ThumbnailOptions thumbnailOptions)
@@ -54,7 +54,7 @@ public static async Task<byte[]> LoadIconFromPathAsync(string filePath, uint thu
 					}
 				}
 			}
-			return await LoadIconWithoutOverlayAsync(filePath, thumbnailSize, isFolder, false);
+			return await LoadIconWithoutOverlayAsync(filePath, thumbnailSize, isFolder, false, false);
 		}
 	}
 }
diff --git a/src/Files.App/ViewModels/Properties/Items/DriveProperties.cs b/src/Files.App/ViewModels/Properties/Items/DriveProperties.cs
@@ -56,10 +56,10 @@ public async override Task GetSpecialPropertiesAsync()
 				}
 				else
 				{
-					ViewModel.IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Drive.Path, 80, false, false);
+					ViewModel.IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Drive.Path, 80, false, false, false);
 				}
 
-				ViewModel.IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Drive.DeviceID, 80, false, false); // For network shortcuts
+				ViewModel.IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Drive.DeviceID, 80, false, false, false); // For network shortcuts
 			}
 
 			if (diskRoot is null || diskRoot.Properties is null)
diff --git a/src/Files.App/ViewModels/Properties/Items/LibraryProperties.cs b/src/Files.App/ViewModels/Properties/Items/LibraryProperties.cs
@@ -49,7 +49,7 @@ public async override Task GetSpecialPropertiesAsync()
 			ViewModel.IsReadOnly = NativeFileOperationsHelper.HasFileAttribute(Library.ItemPath, System.IO.FileAttributes.ReadOnly);
 			ViewModel.IsHidden = NativeFileOperationsHelper.HasFileAttribute(Library.ItemPath, System.IO.FileAttributes.Hidden);
 
-			var fileIconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Library.ItemPath, 80, false, false);
+			var fileIconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Library.ItemPath, 80, false, false, false);
 			if (fileIconData is not null)
 			{
 				ViewModel.IconData = fileIconData;
diff --git a/src/Files.App/ViewModels/UserControls/Previews/BasePreviewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/BasePreviewModel.cs
@@ -85,7 +85,7 @@ await Task.Run(async () =>
 		public async virtual Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
 		{
 			// Requesting sizes larger than 220 may result in a small thumbnail
-			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, Constants.DefaultIconSizes.Jumbo, false, false);
+			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, Constants.DefaultIconSizes.Jumbo, false, false, false);
 			if (iconData is not null)
 				await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(async () => FileImage = await iconData.ToBitmapAsync());
 			else
diff --git a/src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs
@@ -31,7 +31,7 @@ private async Task LoadPreviewAndDetailsAsync()
 			var items = await Folder.GetItemsAsync();
 
 			// Requesting sizes larger than 220 may result in a thumbnail with a small folder
-			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, Constants.DefaultIconSizes.Jumbo, true, false);
+			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, Constants.DefaultIconSizes.Jumbo, true, false, false);
 			if (iconData is not null)
 				Thumbnail = await iconData.ToBitmapAsync();
 
diff --git a/src/Files.App/ViewModels/UserControls/Previews/ShortcutPreviewViewModel.cs b/src/Files.App/ViewModels/UserControls/Previews/ShortcutPreviewViewModel.cs
@@ -36,7 +36,7 @@ public override async Task LoadAsync()
 
 		private async Task LoadItemThumbnailAsync()
 		{
-			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, Constants.DefaultIconSizes.Jumbo, false, false);
+			var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, Constants.DefaultIconSizes.Jumbo, false, false, false);
 			if (iconData is not null)
 			{
 				FileImage = await iconData.ToBitmapAsync();

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ public int CompareTo(INavigationControlItem other)`
`317`	`317`	`public async Task LoadThumbnailAsync()`
`318`	`318`	`{`
`319`	`319`	`if (!string.IsNullOrEmpty(DeviceID) && !string.Equals(DeviceID, "network-folder"))`
`320`		`- IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, Constants.DefaultIconSizes.Large, false, true);`
	`320`	`+ IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, Constants.DefaultIconSizes.Large, false, false, true);`
`321`	`321`
`322`	`322`	`if (Root is not null)`
`323`	`323`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public async Task<bool> CheckDefaultSaveFolderAccess()`
`46`	`46`
`47`	`47`	`public async Task LoadLibraryIconAsync()`
`48`	`48`	`{`
`49`		`- IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.DefaultIconSizes.Large, false, true);`
	`49`	`+ IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.DefaultIconSizes.Large, false, false, true);`
`50`	`50`
`51`	`51`	`if (IconData is not null)`
`52`	`52`	`Icon = await IconData.ToBitmapAsync();`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public WidgetDriveCardItem(DriveItem item)`
`26`	`26`
`27`	`27`	`public async Task LoadCardThumbnailAsync()`
`28`	`28`	`{`
`29`		`- thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.Path, Constants.DefaultIconSizes.Jumbo, true, true);`
	`29`	`+ thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.Path, Constants.DefaultIconSizes.Jumbo, true, false, true);`
`30`	`30`
`31`	`31`	`// Thumbnail data is valid, set the item icon`
`32`	`32`	`if (thumbnailData is not null && thumbnailData.Length > 0)`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public WidgetFolderCardItem(LocationItem item, string text, bool isPinned)`
`50`	`50`
`51`	`51`	`public async Task LoadCardThumbnailAsync()`
`52`	`52`	`{`
`53`		`- _thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.DefaultIconSizes.Jumbo, true, true);`
	`53`	`+ _thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Path, Constants.DefaultIconSizes.Jumbo, true, false, true);`
`54`	`54`
`55`	`55`	`if (_thumbnailData is not null && _thumbnailData.Length > 0)`
`56`	`56`	`Thumbnail = await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => _thumbnailData.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);`
Original file line number	Diff line number	Diff line change
`@@ -948,7 +948,8 @@ private async Task LoadItemThumbnailAsync(ListedItem item, uint thumbnailSize =`
`948`	`948`	`if (item.IsLibrary \|\| item.PrimaryItemAttribute == StorageItemTypes.File \|\| item.IsArchive)`
`949`	`949`	`{`
`950`	`950`	`var getIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false;`
`951`		`- var iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, getIconOnly);`
	`951`	`+ var getThumbnailOnly = !item.IsExecutable && !getIconOnly;`
	`952`	`+ var iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, getThumbnailOnly, getIconOnly);`
`952`	`953`
`953`	`954`	`if (!iconInfo.isIconCached)`
`954`	`955`	`{`
`@@ -965,7 +966,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>`
`965`	`966`	`var cancellationTokenSource = new CancellationTokenSource(3000);`
`966`	`967`	`while (!iconInfo.isIconCached)`
`967`	`968`	`{`
`968`		`- iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, getIconOnly);`
	`969`	`+ iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, getThumbnailOnly, getIconOnly);`
`969`	`970`	`cancellationTokenSource.Token.ThrowIfCancellationRequested();`
`970`	`971`	`await Task.Delay(500);`
`971`	`972`	`}`
`@@ -987,7 +988,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>`
`987`	`988`	`!item.IsExecutable`
`988`	`989`	`)`
`989`	`990`	`{`
`990`		`- var fileIcon = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, true);`
	`991`	`+ var fileIcon = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, false, true);`
`991`	`992`	`var bitmapImage = await fileIcon.IconData.ToBitmapAsync();`
`992`	`993`	`DefaultIcons.TryAdd(item.FileExtension.ToLowerInvariant(), bitmapImage);`
`993`	`994`	`}`
`@@ -1008,7 +1009,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>`
`1008`	`1009`	`else`
`1009`	`1010`	`{`
`1010`	`1011`	`var getIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false \|\| thumbnailSize < 80;`
`1011`		`- var iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, true, getIconOnly);`
	`1012`	`+ var iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, true, false, getIconOnly);`
`1012`	`1013`
`1013`	`1014`	`if (iconInfo.IconData is not null)`
`1014`	`1015`	`{`
`@@ -1287,7 +1288,7 @@ await SafetyExtensions.IgnoreExceptions(() =>`
`1287`	`1288`	`ImageSource? groupImage = null;`
`1288`	`1289`	`if (item.PrimaryItemAttribute != StorageItemTypes.Folder \|\| item.IsArchive)`
`1289`	`1290`	`{`
`1290`		`- var headerIconInfo = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.ItemPath, Constants.DefaultIconSizes.ExtraLarge, false, true);`
	`1291`	`+ var headerIconInfo = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.ItemPath, Constants.DefaultIconSizes.ExtraLarge, false, false, true);`
`1291`	`1292`
`1292`	`1293`	`if (headerIconInfo is not null && !item.IsShortcut)`
`1293`	`1294`	`groupImage = await dispatcherQueue.EnqueueOrInvokeAsync(() => headerIconInfo.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)`
`111`	`111`
`112`	`112`	`if (locationItem.IconData is null)`
`113`	`113`	`{`
`114`		`- locationItem.IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(path, 48u, false, true);`
	`114`	`+ locationItem.IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(path, 48u, false, false, true);`
`115`	`115`
`116`	`116`	`if (locationItem.IconData is not null)`
`117`	`117`	`locationItem.Icon = await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => locationItem.IconData.ToBitmapAsync());`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public static async Task UpdateDrivesAsync()`
`63`	`63`	`ShowProperties = true,`
`64`	`64`	`};`
`65`	`65`
`66`		`- var iconData = provider.IconData ?? await FileThumbnailHelper.LoadIconWithoutOverlayAsync(provider.SyncFolder, Constants.DefaultIconSizes.Large, false, true);`
	`66`	`+ var iconData = provider.IconData ?? await FileThumbnailHelper.LoadIconWithoutOverlayAsync(provider.SyncFolder, Constants.DefaultIconSizes.Large, false, false, true);`
`67`	`67`	`if (iconData is not null)`
`68`	`68`	`{`
`69`	`69`	`cloudProviderItem.IconData = iconData;`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public RecentItem(ShellFileItem fileItem) : base()`
`75`	`75`
`76`	`76`	`public async Task LoadRecentItemIconAsync()`
`77`	`77`	`{`
`78`		`- var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(RecentPath, Constants.DefaultIconSizes.Large, false, false);`
	`78`	`+ var iconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(RecentPath, Constants.DefaultIconSizes.Large, false, false, false);`
`79`	`79`	`if (iconData is not null)`
`80`	`80`	`{`
`81`	`81`	`EmptyImgVis = false;`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@ namespace Files.App.Utils.Storage`
`9`	`9`	`{`
`10`	`10`	`public static class FileThumbnailHelper`
`11`	`11`	`{`
`12`		`- public static Task<(byte[] IconData, byte[] OverlayData, bool isIconCached)> LoadIconAndOverlayAsync(string filePath, uint thumbnailSize, bool isFolder = false, bool getIconOnly = false)`
`13`		`- => Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(filePath, (int)thumbnailSize, isFolder, getIconOnly));`
	`12`	`+ public static Task<(byte[] IconData, byte[] OverlayData, bool isIconCached)> LoadIconAndOverlayAsync(string filePath, uint thumbnailSize, bool isFolder = false, bool getThumbnailOnly = false, bool getIconOnly = false)`
	`13`	`+ => Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(filePath, (int)thumbnailSize, isFolder, getThumbnailOnly, getIconOnly));`
`14`	`14`
`15`		`- public static async Task<byte[]> LoadIconWithoutOverlayAsync(string filePath, uint thumbnailSize, bool isFolder, bool getIconOnly)`
	`15`	`+ public static async Task<byte[]> LoadIconWithoutOverlayAsync(string filePath, uint thumbnailSize, bool isFolder, bool getThumbnailOnly, bool getIconOnly)`
`16`	`16`	`{`
`17`		`- return (await Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(filePath, (int)thumbnailSize, isFolder, getIconOnly))).icon;`
	`17`	`+ return (await Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(filePath, (int)thumbnailSize, isFolder, getThumbnailOnly, getIconOnly))).icon;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public static async Task<byte[]> LoadIconFromStorageItemAsync(IStorageItem item, uint thumbnailSize, ThumbnailMode thumbnailMode, ThumbnailOptions thumbnailOptions)`
`@@ -54,7 +54,7 @@ public static async Task<byte[]> LoadIconFromPathAsync(string filePath, uint thu`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`}`
`57`		`- return await LoadIconWithoutOverlayAsync(filePath, thumbnailSize, isFolder, false);`
	`57`	`+ return await LoadIconWithoutOverlayAsync(filePath, thumbnailSize, isFolder, false, false);`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`