Skip to content

Commit a78d220

Browse files
yaira2yaira2
committed
Cleanup
1 parent 134e085 commit a78d220

File tree

7 files changed

+12
-20
lines changed

7 files changed

+12
-20
lines changed

‎src/Files.App/Data/Models/ItemViewModel.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -937,12 +937,13 @@ private async Task<BitmapImage> GetShieldIcon()
937937
return shieldIcon;
938938
}
939939

940-
// ThumbnailSize is set to 96 so that unless we override it, mode is in turn set to SingleItem
941-
private async Task LoadItemThumbnailAsync(ListedItem item, uint thumbnailSize = 96)
940+
private async Task LoadItemThumbnailAsync(ListedItem item)
942941
{
942+
var thumbnailSize = folderSettings.GetRoundedIconSize();
943+
943944
if (item.IsLibrary || item.PrimaryItemAttribute == StorageItemTypes.File || item.IsArchive)
944945
{
945-
var getIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false;
946+
var getIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false || thumbnailSize < 48;
946947
var getThumbnailOnly = !item.IsExecutable && !getIconOnly;
947948
var iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, false, getThumbnailOnly, getIconOnly);
948949

@@ -1003,7 +1004,7 @@ await dispatcherQueue.EnqueueOrInvokeAsync(async () =>
10031004
}
10041005
else
10051006
{
1006-
var getIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false || thumbnailSize < 80;
1007+
var getIconOnly = UserSettingsService.FoldersSettingsService.ShowThumbnails == false || thumbnailSize < 48;
10071008
var iconInfo = await FileThumbnailHelper.LoadIconAndOverlayAsync(item.ItemPath, thumbnailSize, true, false, getIconOnly);
10081009

10091010
if (iconInfo.IconData is not null)
@@ -1033,7 +1034,7 @@ private static void SetFileTag(ListedItem item)
10331034

10341035
// This works for recycle bin as well as GetFileFromPathAsync/GetFolderFromPathAsync work
10351036
// for file inside the recycle bin (but not on the recycle bin folder itself)
1036-
public async Task LoadExtendedItemPropertiesAsync(ListedItem item, uint thumbnailSize = 20)
1037+
public async Task LoadExtendedItemPropertiesAsync(ListedItem item)
10371038
{
10381039
if (item is null)
10391040
return;
@@ -1066,7 +1067,7 @@ await Task.Run(async () =>
10661067
}
10671068

10681069
cts.Token.ThrowIfCancellationRequested();
1069-
await LoadItemThumbnailAsync(item, thumbnailSize);
1070+
await LoadItemThumbnailAsync(item);
10701071

10711072
if (item.IsLibrary || item.PrimaryItemAttribute == StorageItemTypes.File || item.IsArchive)
10721073
{

‎src/Files.App/Views/Layouts/BaseGroupableLayoutPage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ protected virtual async Task ReloadSelectedItemIconAsync()
130130
ParentShellPageInstance.FilesystemViewModel.CancelExtendedPropertiesLoading();
131131
ParentShellPageInstance.SlimContentPage.SelectedItem.ItemPropertiesInitialized = false;
132132

133-
await ParentShellPageInstance.FilesystemViewModel.LoadExtendedItemPropertiesAsync(ParentShellPageInstance.SlimContentPage.SelectedItem, IconSize);
133+
await ParentShellPageInstance.FilesystemViewModel.LoadExtendedItemPropertiesAsync(ParentShellPageInstance.SlimContentPage.SelectedItem);
134134

135135
if (ParentShellPageInstance.FilesystemViewModel.EnabledGitProperties is not GitProperties.None &&
136136
ParentShellPageInstance.SlimContentPage.SelectedItem is GitItem gitItem)
@@ -149,7 +149,7 @@ protected virtual async Task ReloadSelectedItemsIconAsync()
149149
foreach (var selectedItem in ParentShellPageInstance.SlimContentPage.SelectedItems)
150150
{
151151
selectedItem.ItemPropertiesInitialized = false;
152-
await ParentShellPageInstance.FilesystemViewModel.LoadExtendedItemPropertiesAsync(selectedItem, IconSize);
152+
await ParentShellPageInstance.FilesystemViewModel.LoadExtendedItemPropertiesAsync(selectedItem);
153153
}
154154

155155
if (ParentShellPageInstance.FilesystemViewModel.EnabledGitProperties is not GitProperties.None)

‎src/Files.App/Views/Layouts/BaseLayoutPage.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ public bool AllowItemDrag
101101
Placement = FlyoutPlacementMode.Right,
102102
};
103103

104-
protected abstract uint IconSize { get; }
105104
protected abstract ItemsControl ItemsControl { get; }
106105

107106
public IShellPage? ParentShellPageInstance { get; private set; }
@@ -1157,7 +1156,7 @@ private void RefreshItem(SelectorItem container, object item, bool inRecycleQueu
11571156
uint callbackPhase = 3;
11581157
args.RegisterUpdateCallback(callbackPhase, async (s, c) =>
11591158
{
1160-
await ParentShellPageInstance!.FilesystemViewModel.LoadExtendedItemPropertiesAsync(listedItem, IconSize);
1159+
await ParentShellPageInstance!.FilesystemViewModel.LoadExtendedItemPropertiesAsync(listedItem);
11611160
if (ParentShellPageInstance.FilesystemViewModel.EnabledGitProperties is not GitProperties.None && listedItem is GitItem gitItem)
11621161
await ParentShellPageInstance.FilesystemViewModel.LoadGitPropertiesAsync(gitItem);
11631162
});

‎src/Files.App/Views/Layouts/ColumnLayoutPage.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public sealed partial class ColumnLayoutPage : BaseGroupableLayoutPage
3838

3939
// Properties
4040

41-
protected override uint IconSize => Constants.ShellIconSizes.Large;
4241
protected override ListViewBase ListViewBase => FileList;
4342
protected override SemanticZoom RootZoom => RootGridZoom;
4443

‎src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ public sealed partial class ColumnsLayoutPage : BaseLayoutPage
1919
{
2020
// Properties
2121

22-
protected override uint IconSize => Constants.ShellIconSizes.Large;
2322
protected override ItemsControl ItemsControl => ColumnHost;
2423

2524
public string? OwnerPath { get; private set; }

‎src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,10 @@ public sealed partial class DetailsLayoutPage : BaseGroupableLayoutPage
2828

2929
// Fields
3030

31-
private uint currentIconSize;
32-
3331
private ListedItem? _nextItemToSelect;
3432

3533
// Properties
3634

37-
protected override uint IconSize => currentIconSize;
3835
protected override ListViewBase ListViewBase => FileList;
3936
protected override SemanticZoom RootZoom => RootGridZoom;
4037

@@ -146,8 +143,6 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
146143

147144
ParentShellPageInstance.FilesystemViewModel.EnabledGitProperties = GetEnabledGitProperties(ColumnsViewModel);
148145

149-
currentIconSize = FolderSettings.GetRoundedIconSize();
150-
151146
FolderSettings.LayoutModeChangeRequested += FolderSettings_LayoutModeChangeRequested;
152147
FolderSettings.GroupOptionPreferenceUpdated += ZoomIn;
153148
FolderSettings.SortDirectionPreferenceUpdated += FolderSettings_SortDirectionPreferenceUpdated;
@@ -481,7 +476,7 @@ await Task.WhenAll(filesAndFolders.Select(listedItem =>
481476
{
482477
listedItem.ItemPropertiesInitialized = false;
483478
if (FileList.ContainerFromItem(listedItem) is not null)
484-
return ParentShellPageInstance.FilesystemViewModel.LoadExtendedItemPropertiesAsync(listedItem, currentIconSize);
479+
return ParentShellPageInstance.FilesystemViewModel.LoadExtendedItemPropertiesAsync(listedItem);
485480
else
486481
return Task.CompletedTask;
487482
}));

‎src/Files.App/Views/Layouts/GridLayoutPage.xaml.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public sealed partial class GridLayoutPage : BaseGroupableLayoutPage
2727

2828
// Properties
2929

30-
protected override uint IconSize => currentIconSize;
3130
protected override ListViewBase ListViewBase => FileList;
3231
protected override SemanticZoom RootZoom => RootGridZoom;
3332

@@ -520,7 +519,7 @@ private async Task ReloadItemIconsAsync()
520519
{
521520
listedItem.ItemPropertiesInitialized = false;
522521
if (FileList.ContainerFromItem(listedItem) is not null)
523-
await ParentShellPageInstance.FilesystemViewModel.LoadExtendedItemPropertiesAsync(listedItem, currentIconSize);
522+
await ParentShellPageInstance.FilesystemViewModel.LoadExtendedItemPropertiesAsync(listedItem);
524523
}
525524

526525
if (ParentShellPageInstance.FilesystemViewModel.EnabledGitProperties is not GitProperties.None)

0 commit comments

Comments
 (0)