Fix thumbnails getting squished into squares (#6434)

gave92 · web-flow · commit 1a688f6e9f18 · 2021-10-11T08:16:54.000-04:00
diff --git a/Files/ViewModels/ItemViewModel.cs b/Files/ViewModels/ItemViewModel.cs
@@ -751,7 +751,7 @@ public bool IsLoadingItems
             }
         }
 
-        private async Task LoadItemThumbnail(ListedItem item, uint thumbnailSize = 20, IStorageItem matchingStorageItem = null, bool forceReload = false)
+        private async Task LoadItemThumbnail(ListedItem item, uint thumbnailSize = 20, IStorageItem matchingStorageItem = null)
         {
             var wasIconLoaded = false;
             if (item.IsLibraryItem || item.PrimaryItemAttribute == StorageItemTypes.File || item.IsZipItem)
@@ -775,9 +775,7 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(async () =>
                                 item.FileImage ??= new BitmapImage();
                                 item.FileImage.DecodePixelType = DecodePixelType.Logical;
                                 item.FileImage.DecodePixelWidth = (int)thumbnailSize;
-                                item.FileImage.DecodePixelHeight = (int)thumbnailSize;
                                 await item.FileImage.SetSourceAsync(Thumbnail);
-
                             }, Windows.System.DispatcherQueuePriority.Normal);
                             wasIconLoaded = true;
                         }
@@ -837,9 +835,7 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(async () =>
                                 item.FileImage ??= new BitmapImage();
                                 item.FileImage.DecodePixelType = DecodePixelType.Logical;
                                 item.FileImage.DecodePixelWidth = (int)thumbnailSize;
-                                item.FileImage.DecodePixelHeight = (int)thumbnailSize;
                                 await item.FileImage.SetSourceAsync(Thumbnail);
-                                
                             }, Windows.System.DispatcherQueuePriority.Normal);
                             wasIconLoaded = true;
                         }
@@ -927,7 +923,7 @@ await Task.Run(async () =>
                                 if (matchingStorageFile != null)
                                 {
                                     cts.Token.ThrowIfCancellationRequested();
-                                    await LoadItemThumbnail(item, thumbnailSize, matchingStorageFile, true);
+                                    await LoadItemThumbnail(item, thumbnailSize, matchingStorageFile);
 
                                     var syncStatus = await CheckCloudDriveSyncStatusAsync(matchingStorageFile);
                                     var fileFRN = await FileTagsHelper.GetFileFRN(matchingStorageFile);
@@ -948,7 +944,7 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>
                             }
                             if (!wasSyncStatusLoaded)
                             {
-                                await LoadItemThumbnail(item, thumbnailSize, null, true);
+                                await LoadItemThumbnail(item, thumbnailSize, null);
                             }
                         }
                         else
@@ -960,7 +956,7 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>
                                 if (matchingStorageFolder != null)
                                 {
                                     cts.Token.ThrowIfCancellationRequested();
-                                    await LoadItemThumbnail(item, thumbnailSize, matchingStorageFolder, true);
+                                    await LoadItemThumbnail(item, thumbnailSize, matchingStorageFolder);
                                     if (matchingStorageFolder.DisplayName != item.ItemName && !matchingStorageFolder.DisplayName.StartsWith("$R"))
                                     {
                                         cts.Token.ThrowIfCancellationRequested();
@@ -996,7 +992,7 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>
                             if (!wasSyncStatusLoaded)
                             {
                                 cts.Token.ThrowIfCancellationRequested();
-                                await LoadItemThumbnail(item, thumbnailSize, null, true);
+                                await LoadItemThumbnail(item, thumbnailSize, null);
                             }
                         }
 

Original file line number	Diff line number	Diff line change
`@@ -751,7 +751,7 @@ public bool IsLoadingItems`
`751`	`751`	`}`
`752`	`752`	`}`
`753`	`753`
`754`		`- private async Task LoadItemThumbnail(ListedItem item, uint thumbnailSize = 20, IStorageItem matchingStorageItem = null, bool forceReload = false)`
	`754`	`+ private async Task LoadItemThumbnail(ListedItem item, uint thumbnailSize = 20, IStorageItem matchingStorageItem = null)`
`755`	`755`	`{`
`756`	`756`	`var wasIconLoaded = false;`
`757`	`757`	`if (item.IsLibraryItem \|\| item.PrimaryItemAttribute == StorageItemTypes.File \|\| item.IsZipItem)`
`@@ -775,9 +775,7 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(async () =>`
`775`	`775`	`item.FileImage ??= new BitmapImage();`
`776`	`776`	`item.FileImage.DecodePixelType = DecodePixelType.Logical;`
`777`	`777`	`item.FileImage.DecodePixelWidth = (int)thumbnailSize;`
`778`		`- item.FileImage.DecodePixelHeight = (int)thumbnailSize;`
`779`	`778`	`await item.FileImage.SetSourceAsync(Thumbnail);`
`780`		`-`
`781`	`779`	`}, Windows.System.DispatcherQueuePriority.Normal);`
`782`	`780`	`wasIconLoaded = true;`
`783`	`781`	`}`
`@@ -837,9 +835,7 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(async () =>`
`837`	`835`	`item.FileImage ??= new BitmapImage();`
`838`	`836`	`item.FileImage.DecodePixelType = DecodePixelType.Logical;`
`839`	`837`	`item.FileImage.DecodePixelWidth = (int)thumbnailSize;`
`840`		`- item.FileImage.DecodePixelHeight = (int)thumbnailSize;`
`841`	`838`	`await item.FileImage.SetSourceAsync(Thumbnail);`
`842`		`-`
`843`	`839`	`}, Windows.System.DispatcherQueuePriority.Normal);`
`844`	`840`	`wasIconLoaded = true;`
`845`	`841`	`}`
`@@ -927,7 +923,7 @@ await Task.Run(async () =>`
`927`	`923`	`if (matchingStorageFile != null)`
`928`	`924`	`{`
`929`	`925`	`cts.Token.ThrowIfCancellationRequested();`
`930`		`- await LoadItemThumbnail(item, thumbnailSize, matchingStorageFile, true);`
	`926`	`+ await LoadItemThumbnail(item, thumbnailSize, matchingStorageFile);`
`931`	`927`
`932`	`928`	`var syncStatus = await CheckCloudDriveSyncStatusAsync(matchingStorageFile);`
`933`	`929`	`var fileFRN = await FileTagsHelper.GetFileFRN(matchingStorageFile);`
`@@ -948,7 +944,7 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>`
`948`	`944`	`}`
`949`	`945`	`if (!wasSyncStatusLoaded)`
`950`	`946`	`{`
`951`		`- await LoadItemThumbnail(item, thumbnailSize, null, true);`
	`947`	`+ await LoadItemThumbnail(item, thumbnailSize, null);`
`952`	`948`	`}`
`953`	`949`	`}`
`954`	`950`	`else`
`@@ -960,7 +956,7 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>`
`960`	`956`	`if (matchingStorageFolder != null)`
`961`	`957`	`{`
`962`	`958`	`cts.Token.ThrowIfCancellationRequested();`
`963`		`- await LoadItemThumbnail(item, thumbnailSize, matchingStorageFolder, true);`
	`959`	`+ await LoadItemThumbnail(item, thumbnailSize, matchingStorageFolder);`
`964`	`960`	`if (matchingStorageFolder.DisplayName != item.ItemName && !matchingStorageFolder.DisplayName.StartsWith("$R"))`
`965`	`961`	`{`
`966`	`962`	`cts.Token.ThrowIfCancellationRequested();`
`@@ -996,7 +992,7 @@ await CoreApplication.MainView.DispatcherQueue.EnqueueAsync(() =>`
`996`	`992`	`if (!wasSyncStatusLoaded)`
`997`	`993`	`{`
`998`	`994`	`cts.Token.ThrowIfCancellationRequested();`
`999`		`- await LoadItemThumbnail(item, thumbnailSize, null, true);`
	`995`	`+ await LoadItemThumbnail(item, thumbnailSize, null);`
`1000`	`996`	`}`
`1001`	`997`	`}`
`1002`	`998`