Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Improved quality of the sidebar icons #12852

Merged
merged 6 commits into from
Jul 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/Files.App/Data/Models/ItemViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
using Files.App.Shell;
using Files.App.Storage.FtpStorage;
using Files.App.ViewModels.Previews;
using Files.Core.Helpers;
using Files.Core.Services;
using Files.Core.Services.SizeProvider;
using Files.Core.ViewModels.Dialogs;
using Files.Shared.Cloud;
using Files.Shared.EventArguments;
using Files.Shared.Services;
Expand Down
4 changes: 2 additions & 2 deletions src/Files.App/Data/Models/SidebarPinnedModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)
locationItem.IsInvalid = false;
if (res)
{
var iconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(res.Result, 96u, ThumbnailMode.ListView);
var iconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(res.Result, 16u, ThumbnailMode.ListView, ThumbnailOptions.UseCurrentScale);
locationItem.IconData = iconData;

if (locationItem.IconData is not null)
Expand All @@ -114,7 +114,7 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)

if (locationItem.IconData is null)
{
locationItem.IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(path, 96u);
locationItem.IconData = await FileThumbnailHelper.LoadIconWithoutOverlayAsync(path, 48u);

if (locationItem.IconData is not null)
locationItem.Icon = await App.Window.DispatcherQueue.EnqueueOrInvokeAsync(() => locationItem.IconData.ToBitmapAsync());
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Filesystem/Search/FolderSearch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ private async Task<ListedItem> GetListedItemAsync(IStorageItem item)
}
if (listedItem is not null && MaxItemCount > 0) // Only load icon for searchbox suggestions
{
var iconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(item, ThumbnailSize, ThumbnailMode.ListView);
var iconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(item, ThumbnailSize, ThumbnailMode.ListView, ThumbnailOptions.ResizeThumbnail);
if (iconData is not null)
{
listedItem.FileImage = await iconData.ToBitmapAsync();
Expand Down
8 changes: 4 additions & 4 deletions src/Files.App/Helpers/FileThumbnailHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ public static async Task<byte[]> LoadIconWithoutOverlayAsync(string filePath, ui
return (await Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(filePath, (int)thumbnailSize, isFolder, false))).icon;
}

public static async Task<byte[]> LoadIconFromStorageItemAsync(IStorageItem item, uint thumbnailSize, ThumbnailMode thumbnailMode)
public static async Task<byte[]> LoadIconFromStorageItemAsync(IStorageItem item, uint thumbnailSize, ThumbnailMode thumbnailMode, ThumbnailOptions thumbnailOptions)
{
if (item.IsOfType(StorageItemTypes.File))
{
using var thumbnail = (StorageItemThumbnail)await FilesystemTasks.Wrap(
() => item.AsBaseStorageFile().GetThumbnailAsync(thumbnailMode, thumbnailSize, ThumbnailOptions.ResizeThumbnail).AsTask());
() => item.AsBaseStorageFile().GetThumbnailAsync(thumbnailMode, thumbnailSize, thumbnailOptions).AsTask());
if (thumbnail is not null)
{
return await thumbnail.ToByteArrayAsync();
Expand All @@ -41,7 +41,7 @@ public static async Task<byte[]> LoadIconFromStorageItemAsync(IStorageItem item,
else if (item.IsOfType(StorageItemTypes.Folder))
{
using var thumbnail = (StorageItemThumbnail)await FilesystemTasks.Wrap(
() => item.AsBaseStorageFolder().GetThumbnailAsync(thumbnailMode, thumbnailSize, ThumbnailOptions.ResizeThumbnail).AsTask());
() => item.AsBaseStorageFolder().GetThumbnailAsync(thumbnailMode, thumbnailSize, thumbnailOptions).AsTask());
if (thumbnail is not null)
{
return await thumbnail.ToByteArrayAsync();
Expand All @@ -57,7 +57,7 @@ public static async Task<byte[]> LoadIconFromPathAsync(string filePath, uint thu
var item = await StorageHelpers.ToStorageItem<IStorageItem>(filePath);
if (item is not null)
{
var iconData = await LoadIconFromStorageItemAsync(item, thumbnailSize, thumbnailMode);
var iconData = await LoadIconFromStorageItemAsync(item, thumbnailSize, thumbnailMode, ThumbnailOptions.ResizeThumbnail);
if (iconData is not null)
{
return iconData;
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/ViewModels/Previews/BasePreviewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ await Task.Run(async () =>
/// <returns>A list of details</returns>
public async virtual Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
{
var iconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(Item.ItemFile, 256, ThumbnailMode.SingleItem);
var iconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(Item.ItemFile, 256, ThumbnailMode.SingleItem, ThumbnailOptions.ResizeThumbnail);

iconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, 256);
if (iconData is not null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ private async Task LoadPreviewAndDetailsAsync()
Folder = await StorageFileExtensions.DangerousGetFolderFromPathAsync(Item.ItemPath, rootItem);
var items = await Folder.GetItemsAsync();

var iconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(Folder, 256, ThumbnailMode.SingleItem);
var iconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(Folder, 256, ThumbnailMode.SingleItem, ThumbnailOptions.UseCurrentScale);
iconData ??= await FileThumbnailHelper.LoadIconWithoutOverlayAsync(Item.ItemPath, 256, true);

if (iconData is not null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public async override Task GetSpecialProperties()
{
if (diskRoot is not null)
{
ViewModel.IconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(diskRoot, 80, ThumbnailMode.SingleItem);
ViewModel.IconData = await FileThumbnailHelper.LoadIconFromStorageItemAsync(diskRoot, 80, ThumbnailMode.SingleItem, ThumbnailOptions.ResizeThumbnail);
}
else
{
Expand Down