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.

Sign up for GitHub

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

Jump to bottom

Fix: Fix folder icons from getting stuck #14934

Closed
wants to merge 1 commit into from
Closed

Fix: Fix folder icons from getting stuck #14934

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions src/Files.App/Data/Models/ItemViewModel.cs
View file
Open in desktop
Expand Up @@ -914,11 +914,11 @@ private async Task<BitmapImage> GetShieldIcon()
return shieldIcon;
}

private async Task LoadThumbnailAsync(ListedItem item)
private async Task LoadThumbnailAsync(ListedItem item, bool loadBasicFolderIcon)
{
// Cancel if thumbnails aren't enabled
var thumbnailSize = folderSettings.GetRoundedIconSize();
var returnIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false || thumbnailSize < 48;
var returnIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false || thumbnailSize < 48 ||
(item.IsFolder && loadBasicFolderIcon);

// Get thumbnail
var result = await FileThumbnailHelper.GetIconAsync(
Expand Down Expand Up @@ -990,7 +990,7 @@ public async Task LoadExtendedItemPropertiesAsync(ListedItem item)
}

cts.Token.ThrowIfCancellationRequested();
await LoadThumbnailAsync(item);
await LoadThumbnailAsync(item, true);

cts.Token.ThrowIfCancellationRequested();
if (item.IsLibrary || item.PrimaryItemAttribute == StorageItemTypes.File || item.IsArchive)
Expand Down Expand Up @@ -1097,16 +1097,16 @@ public async Task LoadExtendedItemPropertiesAsync(ListedItem item)
SetFileTag(item);
});
}
else
else if (UserSettingsService.FoldersSettingsService.ShowThumbnails &&
(item.IsFolder || item.SyncStatusUI.SyncStatus != CloudDriveSyncStatus.NotSynced && item.SyncStatusUI.SyncStatus != CloudDriveSyncStatus.Unknown))
{
// Try loading thumbnail for cloud files in case they weren't cached the first time
if (item.SyncStatusUI.SyncStatus != CloudDriveSyncStatus.NotSynced && item.SyncStatusUI.SyncStatus != CloudDriveSyncStatus.Unknown)
// Load thumbnail for folders (we initially load a basic folder icon to prevent a bug where thumbnails stop loading #14817)
// Also reload thumbnails cloud files in case they weren't cached the first time
_ = Task.Run(async () =>
{
_ = Task.Run(async () => {
await Task.Delay(500);
await LoadThumbnailAsync(item);
});
}
await Task.Delay(500);
await LoadThumbnailAsync(item, false);
});
}

if (loadGroupHeaderInfo)
Expand Down