Fix icon transparency issues (Shelf and Tags)

Author: d2dyno1

src/Files.App/Data/Contracts/ImagingService.cs

@@ -13,15 +13,12 @@ internal sealed class ImagingService : IImageService
 		/// <inheritdoc/>
 		public async Task<IImage?> GetIconAsync(IStorable storable, CancellationToken cancellationToken)
 		{
-			if (storable is not ILocatableStorable locatableStorable)
-				return null;
-
-			var iconData = await FileThumbnailHelper.LoadIconFromPathAsync(locatableStorable.Path, 24u, ThumbnailMode.ListView, ThumbnailOptions.ResizeThumbnail);
+			var iconData = await FileThumbnailHelper.GetIconAsync(storable.Id, 24u, storable is IFolder, IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);
 			if (iconData is null)
 				return null;
 
 			var bitmapImage = await iconData.ToBitmapAsync();
-			return new BitmapImageModel(bitmapImage);
+			return bitmapImage is null ? null : new BitmapImageModel(bitmapImage);
 		}
 
 		public async Task<IImage?> GetImageModelFromDataAsync(byte[] rawData)

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

@@ -6,6 +6,7 @@ namespace Files.App.Data.Items
 	public sealed partial class ShelfItem : ObservableObject, IWrapper<IStorable>, IAsyncInitialize
 	{
 		private readonly IImageService _imageService;
+		private readonly ICollection<ShelfItem> _sourceCollection;
 
 		[ObservableProperty] private IImage? _Icon;
 		[ObservableProperty] private string? _Name;
@@ -14,9 +15,10 @@ public sealed partial class ShelfItem : ObservableObject, IWrapper<IStorable>, I
 		/// <inheritdoc/>
 		public IStorable Inner { get; }
 
-		public ShelfItem(IStorable storable, IImage? icon = null)
+		public ShelfItem(IStorable storable, ICollection<ShelfItem> sourceCollection, IImage? icon = null)
 		{
 			_imageService = Ioc.Default.GetRequiredService<IImageService>();
+			_sourceCollection = sourceCollection;
 			Inner = storable;
 			Icon = icon;
 			Name = storable.Name;
@@ -28,5 +30,11 @@ public async Task InitAsync(CancellationToken cancellationToken = default)
 		{
 			Icon = await _imageService.GetIconAsync(Inner, cancellationToken);
 		}
+
+		[RelayCommand]
+		private void Remove()
+		{
+			_sourceCollection.Remove(this);
+		}
 	}
 }

src/Files.App/UserControls/Pane/ShelfPane.xaml

@@ -35,6 +35,7 @@
 			Grid.Row="0"
 			Padding="12"
 			Spacing="8">
+
 			<!--  Title  -->
 			<TextBlock
 				HorizontalAlignment="Center"
@@ -55,6 +56,16 @@
 						<StackPanel Orientation="Horizontal" Spacing="8">
 							<Image Height="20" Source="{x:Bind Icon, Mode=OneWay, Converter={StaticResource ImageModelToImageConverter}}" />
 							<TextBlock Text="{x:Bind Name, Mode=OneWay}" />
+
+							<StackPanel.ContextFlyout>
+								<MenuFlyout>
+									<MenuFlyoutItem Command="{x:Bind RemoveCommand}" Text="Remove">
+										<MenuFlyoutItem.Icon>
+											<FontIcon Glyph="&#xE738;" />
+										</MenuFlyoutItem.Icon>
+									</MenuFlyoutItem>
+								</MenuFlyout>
+							</StackPanel.ContextFlyout>
 						</StackPanel>
 					</DataTemplate>
 				</ListView.ItemTemplate>
@@ -66,6 +77,7 @@
 			Grid.Row="1"
 			Padding="12,8,12,8"
 			Spacing="4">
+
 			<!--  (Divider)  -->
 			<Border Height="1" Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
 

src/Files.App/UserControls/Pane/ShelfPane.xaml.cs

@@ -52,7 +52,7 @@ private async void Shelf_Drop(object sender, DragEventArgs e)
 				if (storable is null)
 					continue;
 
-				var shelfItem = new ShelfItem(storable);
+				var shelfItem = new ShelfItem(storable, ItemsSource);
 				_ = shelfItem.InitAsync();
 
 				ItemsSource.Add(shelfItem);