Code Quality: Use LoadIconWithoutOverlayAsync for Drives Widget

Author: yaira2

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

@@ -219,7 +219,7 @@ public FrameworkElement? ItemDecorator
 				ToolTipService.SetToolTip(itemDecorator, "Eject".GetLocalizedResource());
 
 				itemDecorator.Click += ItemDecorator_Click;
-        
+
 				return itemDecorator;
 			}
 		}
@@ -314,29 +314,22 @@ public int CompareTo(INavigationControlItem other)
 			return result == 0 ? Text.CompareTo(other.Text) : result;
 		}
 
-		public async Task LoadThumbnailAsync(bool isSidebar = false)
+		public async Task LoadThumbnailAsync()
 		{
-			if (!isSidebar)
+			if (!string.IsNullOrEmpty(DeviceID) && !string.Equals(DeviceID, "network-folder"))
+				IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, Constants.DefaultIconSizes.Large, false, true);
+
+			if (Root is not null)
 			{
 				using var thumbnail = await DriveHelpers.GetThumbnailAsync(Root);
 				IconData ??= await thumbnail.ToByteArrayAsync();
 			}
-			else
-			{
-				if (!string.IsNullOrEmpty(DeviceID) && !string.Equals(DeviceID, "network-folder"))
-					IconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(DeviceID, Constants.DefaultIconSizes.Large, false, true);
 
-				if (Root is not null)
-				{
-					using var thumbnail = await DriveHelpers.GetThumbnailAsync(Root);
-					IconData ??= await thumbnail.ToByteArrayAsync();
-				}
+			if (string.Equals(DeviceID, "network-folder"))
+				IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.NetworkDrives).IconData;
 
-				if (string.Equals(DeviceID, "network-folder"))
-					IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.NetworkDrives).IconData;
+			IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Folder).IconData;
 
-				IconData ??= UIHelpers.GetSidebarIconResourceInfo(Constants.ImageRes.Folder).IconData;
-			}
 			Icon ??= await IconData.ToBitmapAsync();
 		}
 

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

@@ -1,12 +1,8 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using CommunityToolkit.Mvvm.DependencyInjection;
-using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.WinUI;
-using Files.App.Data.Items;
-using Files.App.Utils.Shell;
 using Files.App.ViewModels.Widgets;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
@@ -25,12 +21,13 @@ public class DriveCardItem : WidgetCardItem, IWidgetCardItem<DriveItem>, ICompar
 		private byte[] thumbnailData;
 
 		public new DriveItem Item { get; private set; }
-		public bool HasThumbnail => thumbnail is not null && thumbnailData is not null;
+
 		public BitmapImage Thumbnail
 		{
 			get => thumbnail;
 			set => SetProperty(ref thumbnail, value);
 		}
+
 		public DriveCardItem(DriveItem item)
 		{
 			Item = item;
@@ -39,20 +36,11 @@ public DriveCardItem(DriveItem item)
 
 		public async Task LoadCardThumbnailAsync()
 		{
-			// Try load thumbnail using ListView mode
-			if (thumbnailData is null || thumbnailData.Length == 0)
-				thumbnailData = await FileThumbnailHelper.LoadIconFromPathAsync(Item.Path, Convert.ToUInt32(Constants.DefaultIconSizes.Jumbo), Windows.Storage.FileProperties.ThumbnailMode.SingleItem, Windows.Storage.FileProperties.ThumbnailOptions.ResizeThumbnail);
-
-			// Thumbnail is still null, use DriveItem icon (loaded using SingleItem mode)
-			if (thumbnailData is null || thumbnailData.Length == 0)
-			{
-				await Item.LoadThumbnailAsync();
-				thumbnailData = Item.IconData;
-			}
+			thumbnailData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.Path, Constants.DefaultIconSizes.Jumbo, true, true);
 
 			// Thumbnail data is valid, set the item icon
 			if (thumbnailData is not null && thumbnailData.Length > 0)
-				Thumbnail = await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => thumbnailData.ToBitmapAsync(Constants.DefaultIconSizes.Jumbo));
+				Thumbnail = await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() => thumbnailData.ToBitmapAsync(), Microsoft.UI.Dispatching.DispatcherQueuePriority.Low);
 		}
 
 		public int CompareTo(DriveCardItem? other) => Item.Path.CompareTo(other?.Item?.Path);
@@ -135,7 +123,7 @@ public DrivesWidget()
 			OpenPropertiesCommand = new RelayCommand<DriveCardItem>(OpenProperties);
 			PinToFavoritesCommand = new AsyncRelayCommand<WidgetCardItem>(PinToFavoritesAsync);
 			UnpinFromFavoritesCommand = new AsyncRelayCommand<WidgetCardItem>(UnpinFromFavoritesAsync);
-			MapNetworkDriveCommand = new AsyncRelayCommand(DoNetworkMapDriveAsync); 
+			MapNetworkDriveCommand = new AsyncRelayCommand(DoNetworkMapDriveAsync);
 			DisconnectNetworkDriveCommand = new RelayCommand<DriveCardItem>(DisconnectNetworkDrive);
 		}
 

src/Files.App/UserControls/Widgets/IWidgetCardItem.cs

@@ -10,8 +10,6 @@ public interface IWidgetCardItem<T>
 	{
 		T Item { get; }
 
-		bool HasThumbnail { get; }
-
 		BitmapImage Thumbnail { get; }
 
 		Task LoadCardThumbnailAsync();

src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs

@@ -54,7 +54,6 @@ public class FolderCardItem : WidgetCardItem, IWidgetCardItem<LocationItem>
 
 		public string AutomationProperties { get; set; }
 		public bool HasPath => !string.IsNullOrEmpty(Path);
-		public bool HasThumbnail => thumbnail is not null && thumbnailData is not null;
 		public BitmapImage Thumbnail
 		{
 			get => thumbnail;

src/Files.App/Utils/Shell/Win32API.cs

@@ -258,7 +258,7 @@ public static (byte[]? icon, byte[]? overlay) GetFileIconAndOverlay(string path,
 						var flags = Shell32.SIIGBF.SIIGBF_BIGGERSIZEOK;
 
 						if (getIconOnly)
-							flags |= Shell32.SIIGBF.SIIGBF_ICONONLY;
+							flags = Shell32.SIIGBF.SIIGBF_ICONONLY;
 
 						var hres = fctry.GetImage(new SIZE(thumbnailSize, thumbnailSize), flags, out var hbitmap);
 						if (hres == HRESULT.S_OK)

src/Files.App/ViewModels/UserControls/SidebarViewModel.cs

@@ -374,7 +374,7 @@ await lib.CheckDefaultSaveFolderAccess() &&
 					if (!section.ChildItems.Any(x => x.Path == drive.Path))
 					{
 						section.ChildItems.Insert(index < 0 ? section.ChildItems.Count : Math.Min(index, section.ChildItems.Count), drive);
-						await drive.LoadThumbnailAsync(true);
+						await drive.LoadThumbnailAsync();
 					}
 				}
 				else
@@ -388,7 +388,7 @@ await lib.CheckDefaultSaveFolderAccess() &&
 						int position = paths.IndexOf(drivePath);
 
 						section.ChildItems.Insert(position, drive);
-						await drive.LoadThumbnailAsync(true);
+						await drive.LoadThumbnailAsync();
 					}
 				}
 			}