C

Author: yaira2

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

@@ -214,11 +214,11 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
 				// Restore correct scroll position
 				ContentScroller?.ChangeView(null, previousOffset, null);
 
-				// Reload icons with correct size but only if the size changed
-				var requestedIconSize = LayoutSizeKindHelper.GetIconSize(FolderLayoutModes.DetailsView);
-				if (requestedIconSize != currentIconSize)
+				// Check if icons need to be reloaded
+				var newIconSize = LayoutSizeKindHelper.GetIconSize(FolderLayoutModes.DetailsView);
+				if (newIconSize != currentIconSize)
 				{
-					currentIconSize = requestedIconSize;
+					currentIconSize = newIconSize;
 					_ = ReloadItemIconsAsync();
 				}
 			}

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

@@ -179,30 +179,30 @@ private void LayoutSettingsService_PropertyChanged(object? sender, PropertyChang
 
 				// Update the container style to match the item size
 				SetItemContainerStyle();
-				FolderSettings_IconHeightChanged();
+				FolderSettings_IconSizeChanged();
 			}
 			if (e.PropertyName == nameof(ILayoutSettingsService.TilesViewSize))
 			{
 				NotifyPropertyChanged(nameof(ItemWidthTilesView));
 
 				// Update the container style to match the item size
 				SetItemContainerStyle();
-				FolderSettings_IconHeightChanged();
+				FolderSettings_IconSizeChanged();
 			}
 			if (e.PropertyName == nameof(ILayoutSettingsService.GridViewSize))
 			{
 				NotifyPropertyChanged(nameof(ItemWidthGridView));
 
 				// Update the container style to match the item size
 				SetItemContainerStyle();
-				FolderSettings_IconHeightChanged();
+				FolderSettings_IconSizeChanged();
 			}
 
 			// Restore correct scroll position
 			ContentScroller?.ChangeView(previousHorizontalOffset, previousVerticalOffset, null);
 		}
 
-		private async void FolderSettings_LayoutModeChangeRequested(object? sender, LayoutModeEventArgs e)
+		private void FolderSettings_LayoutModeChangeRequested(object? sender, LayoutModeEventArgs e)
 		{
 			if (FolderSettings.LayoutMode == FolderLayoutModes.ListView
 				|| FolderSettings.LayoutMode == FolderLayoutModes.TilesView
@@ -211,14 +211,7 @@ private async void FolderSettings_LayoutModeChangeRequested(object? sender, Layo
 				// Set ItemTemplate
 				SetItemTemplate();
 				SetItemContainerStyle();
-
-				var requestedIconSize = LayoutSizeKindHelper.GetIconSize(FolderSettings.LayoutMode);
-				if (requestedIconSize != currentIconSize)
-				{
-					currentIconSize = requestedIconSize;
-					// Don't change this await https://github.com/files-community/Files/pull/16708#discussion_r1916402106
-					await ReloadItemIconsAsync();
-				}
+				FolderSettings_IconSizeChanged();
 			}
 		}
 
@@ -500,16 +493,13 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
 		protected override bool CanGetItemFromElement(object element)
 			=> element is GridViewItem;
 
-		private async void FolderSettings_IconHeightChanged()
+		private void FolderSettings_IconSizeChanged()
 		{
-			// Get new icon size
-			var requestedIconSize = LayoutSizeKindHelper.GetIconSize(FolderSettings.LayoutMode);
-
-			// Prevents reloading icons when the icon size hasn't changed
-			if (requestedIconSize != currentIconSize)
+			// Check if icons need to be reloaded
+			var newIconSize = LayoutSizeKindHelper.GetIconSize(FolderSettings.LayoutMode);
+			if (newIconSize != currentIconSize)
 			{
-				// Update icon size before refreshing
-				currentIconSize = requestedIconSize;
+				currentIconSize = newIconSize;
 				_ = ReloadItemIconsAsync();
 			}
 		}