Skip to content

Commit 3dd6264

Browse files
yaira2yaira2
committed
Revert
1 parent eb06ec2 commit 3dd6264

20 files changed

+34
-22
lines changed

‎src/Files.App/Constants.cs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,18 @@ public static class Appearance
118118
public const string StandardFont = "Segoe UI Variable";
119119
}
120120

121+
// Default icon sizes that are available for files and folders
122+
public static class ShellIconSizes
123+
{
124+
public const int Small = 16;
125+
126+
public const int Large = 32;
127+
128+
public const int ExtraLarge = 48;
129+
130+
public const int Jumbo = 256;
131+
}
132+
121133
public static class Widgets
122134
{
123135
public static class Drives

‎src/Files.App/Data/Items/DriveItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ public async Task LoadThumbnailAsync()
316316
{
317317
var result = await FileThumbnailHelper.GetIconAsync(
318318
DeviceID,
319-
(int)LayoutItemIconSizeKind.Small,
319+
Constants.ShellIconSizes.Small,
320320
false,
321321
false,
322322
IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

‎src/Files.App/Data/Items/SidebarLibraryItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public async Task LoadLibraryIconAsync()
4848
{
4949
var result = await FileThumbnailHelper.GetIconAsync(
5050
Path,
51-
(int)LayoutItemIconSizeKind.Small,
51+
Constants.ShellIconSizes.Small,
5252
false,
5353
false,
5454
IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

‎src/Files.App/Data/Items/WidgetDriveCardItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public async Task LoadCardThumbnailAsync()
2828
{
2929
var result = await FileThumbnailHelper.GetIconAsync(
3030
Item.Path,
31-
(int)LayoutItemIconSizeKind.Large,
31+
Constants.ShellIconSizes.Large,
3232
true,
3333
false,
3434
IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

‎src/Files.App/Data/Items/WidgetFolderCardItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public async Task LoadCardThumbnailAsync()
5252
{
5353
var result = await FileThumbnailHelper.GetIconAsync(
5454
Path,
55-
(int)LayoutItemIconSizeKind.Large,
55+
Constants.ShellIconSizes.Large,
5656
true,
5757
false,
5858
IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1309,7 +1309,7 @@ await SafetyExtensions.IgnoreExceptions(() =>
13091309
{
13101310
var headerIconInfo = await FileThumbnailHelper.GetIconAsync(
13111311
item.ItemPath,
1312-
(int)LayoutItemIconSizeKind.Large,
1312+
Constants.ShellIconSizes.Large,
13131313
false,
13141314
false,
13151315
IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public async Task<LocationItem> CreateLocationItemFromPathAsync(string path)
102102
{
103103
var result = await FileThumbnailHelper.GetIconAsync(
104104
res.Result.Path,
105-
(int)LayoutItemIconSizeKind.Small,
105+
Constants.ShellIconSizes.Small,
106106
true,
107107
false,
108108
IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

‎src/Files.App/Helpers/Layout/LayoutPreferencesManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,11 @@ public uint GetRoundedIconSize()
230230
return LayoutMode switch
231231
{
232232
FolderLayoutModes.DetailsView
233-
=> (int)LayoutItemIconSizeKind.Large,
233+
=> Constants.ShellIconSizes.Large,
234234
FolderLayoutModes.ListView
235-
=> (int)LayoutItemIconSizeKind.Large,
235+
=> Constants.ShellIconSizes.Large,
236236
FolderLayoutModes.ColumnView
237-
=> (int)LayoutItemIconSizeKind.Large,
237+
=> Constants.ShellIconSizes.Large,
238238
_ when LayoutMode == FolderLayoutModes.GridView && UserSettingsService.LayoutSettingsService.ItemSizeGridView <= GridViewSizeKind.Small ||
239239
LayoutMode == FolderLayoutModes.TilesView
240240
=> 96,

‎src/Files.App/Helpers/Navigation/NavigationHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ private static async Task UpdateTabInfoAsync(TabBarItem tabItem, object navigati
190190
{
191191
var result = await FileThumbnailHelper.GetIconAsync(
192192
currentPath,
193-
(int)LayoutItemIconSizeKind.Small,
193+
Constants.ShellIconSizes.Small,
194194
true,
195195
false,
196196
IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

‎src/Files.App/Utils/Cloud/CloudDrivesManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static async Task UpdateDrivesAsync()
6969
{
7070
var result = await FileThumbnailHelper.GetIconAsync(
7171
provider.SyncFolder,
72-
(int)LayoutItemIconSizeKind.Small,
72+
Constants.ShellIconSizes.Small,
7373
false,
7474
false,
7575
IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

‎src/Files.App/Utils/RecentItem/RecentItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public async Task LoadRecentItemIconAsync()
6666
{
6767
var result = await FileThumbnailHelper.GetIconAsync(
6868
RecentPath,
69-
(int)LayoutItemIconSizeKind.Small,
69+
Constants.ShellIconSizes.Small,
7070
false,
7171
false,
7272
IconOptions.UseCurrentScale);

‎src/Files.App/Utils/Storage/Search/FolderSearch.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ private async Task<ListedItem> GetListedItemAsync(IStorageItem item)
495495
{
496496
var iconResult = await FileThumbnailHelper.GetIconAsync(
497497
item.Path,
498-
(int)LayoutItemIconSizeKind.Small,
498+
Constants.ShellIconSizes.Small,
499499
item.IsOfType(StorageItemTypes.Folder),
500500
false,
501501
IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);

‎src/Files.App/ViewModels/Properties/BasePropertiesPage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
100100

101101
var result = await FileThumbnailHelper.GetIconAsync(
102102
file.Path,
103-
(int)LayoutItemIconSizeKind.ExtraLarge,
103+
Constants.ShellIconSizes.ExtraLarge,
104104
false,
105105
false,
106106
IconOptions.UseCurrentScale);

‎src/Files.App/ViewModels/Properties/Items/DriveProperties.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public async override Task GetSpecialPropertiesAsync()
5252
{
5353
var result = await FileThumbnailHelper.GetIconAsync(
5454
Drive.Path,
55-
(int)LayoutItemIconSizeKind.ExtraLarge,
55+
Constants.ShellIconSizes.ExtraLarge,
5656
true,
5757
false,
5858
IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale);
@@ -63,7 +63,7 @@ public async override Task GetSpecialPropertiesAsync()
6363
{
6464
result = await FileThumbnailHelper.GetIconAsync(
6565
Drive.DeviceID,
66-
(int)LayoutItemIconSizeKind.ExtraLarge,
66+
Constants.ShellIconSizes.ExtraLarge,
6767
true, false, IconOptions.ReturnIconOnly | IconOptions.UseCurrentScale); // For network shortcuts
6868

6969
ViewModel.IconData = result.IconData;

‎src/Files.App/ViewModels/Properties/Items/FileProperties.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public override async Task GetSpecialPropertiesAsync()
108108

109109
var result = await FileThumbnailHelper.GetIconAsync(
110110
Item.ItemPath,
111-
(int)LayoutItemIconSizeKind.ExtraLarge,
111+
Constants.ShellIconSizes.ExtraLarge,
112112
false,
113113
false,
114114
IconOptions.UseCurrentScale);

‎src/Files.App/ViewModels/Properties/Items/FolderProperties.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public async override Task GetSpecialPropertiesAsync()
7676

7777
var result = await FileThumbnailHelper.GetIconAsync(
7878
Item.ItemPath,
79-
(int)LayoutItemIconSizeKind.ExtraLarge,
79+
Constants.ShellIconSizes.ExtraLarge,
8080
true,
8181
false,
8282
IconOptions.UseCurrentScale);

‎src/Files.App/ViewModels/Properties/Items/LibraryProperties.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public async override Task GetSpecialPropertiesAsync()
5151

5252
var result = await FileThumbnailHelper.GetIconAsync(
5353
Library.ItemPath,
54-
(int)LayoutItemIconSizeKind.ExtraLarge,
54+
Constants.ShellIconSizes.ExtraLarge,
5555
true,
5656
false,
5757
IconOptions.UseCurrentScale);

‎src/Files.App/ViewModels/UserControls/Previews/BasePreviewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public async virtual Task<List<FileProperty>> LoadPreviewAndDetailsAsync()
8686
{
8787
var result = await FileThumbnailHelper.GetIconAsync(
8888
Item.ItemPath,
89-
(int)LayoutItemIconSizeKind.Jumbo,
89+
Constants.ShellIconSizes.Jumbo,
9090
false,
9191
false,
9292
IconOptions.None);

‎src/Files.App/ViewModels/UserControls/Previews/FolderPreviewViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private async Task LoadPreviewAndDetailsAsync()
3333
// Requesting sizes larger than 220 may result in a thumbnail with a small folder
3434
var result = await FileThumbnailHelper.GetIconAsync(
3535
Item.ItemPath,
36-
(int)LayoutItemIconSizeKind.Jumbo,
36+
Constants.ShellIconSizes.Jumbo,
3737
true,
3838
false,
3939
IconOptions.None);

‎src/Files.App/ViewModels/UserControls/Previews/ShortcutPreviewViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private async Task LoadItemThumbnailAsync()
3838
{
3939
var result = await FileThumbnailHelper.GetIconAsync(
4040
Item.ItemPath,
41-
(int)LayoutItemIconSizeKind.Jumbo,
41+
Constants.ShellIconSizes.Jumbo,
4242
false,
4343
false,
4444
IconOptions.None);

0 commit comments

Comments
 (0)