Fix issue where image previews in preview pane wouldn't work (#6144)

Author: winston-de

Files/ViewModels/ItemViewModel.cs

@@ -1072,9 +1072,10 @@ await FilesystemTasks.Wrap(() => CoreApplication.MainView.DispatcherQueue.Enqueu
         private async Task<ImageSource> GetItemTypeGroupIcon(ListedItem item, BaseStorageFile matchingStorageItem = null)
         {
             ImageSource groupImage = null;
-            if (item.PrimaryItemAttribute != StorageItemTypes.Folder)
+            if (item.PrimaryItemAttribute != StorageItemTypes.Folder || item.IsZipItem)
             {
-                var headerIconInfo = await FileThumbnailHelper.LoadIconFromPathAsync(item.ItemPath, 76, ThumbnailMode.ListView);
+                var headerIconInfo = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(item.ItemPath, 64u);
+
                 if (headerIconInfo != null && !item.IsShortcutItem)
                 {
                     groupImage = await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() => headerIconInfo.ToBitmapAsync(), Windows.System.DispatcherQueuePriority.Low);

Files/ViewModels/Previews/ImagePreviewViewModel.cs

@@ -30,21 +30,10 @@ public ImageSource ImageSource
 
         public override async Task<List<FileProperty>> LoadPreviewAndDetails()
         {
-            FileRandomAccessStream stream = (FileRandomAccessStream)await Item.ItemFile.OpenAsync(FileAccessMode.Read);
-
-            // svg files require a different type of source
-            if (!Item.ItemPath.EndsWith(".svg"))
-            {
-                var bitmap = new BitmapImage();
-                ImageSource = bitmap;
-                await bitmap.SetSourceAsync(stream);
-            }
-            else
-            {
-                var bitmap = new SvgImageSource();
-                ImageSource = bitmap;
-                await bitmap.SetSourceAsync(stream);
-            }
+            IRandomAccessStream stream = await Item.ItemFile.OpenAsync(FileAccessMode.Read);
+            BitmapImage bitmap = new();
+            await bitmap.SetSourceAsync(stream);
+            ImageSource = bitmap;
 
             return new List<FileProperty>();
         }