Fix: Fixed issue where icon overlays were cached (#14727)

Author: yaira2

src/Files.App/Helpers/BitmapHelper.cs

@@ -28,6 +28,7 @@ internal static class BitmapHelper
 				{
 					image.DecodePixelWidth = decodeSize;
 					image.DecodePixelHeight = decodeSize;
+					image.DecodePixelType = DecodePixelType.Logical;
 				}
 				await image.SetSourceAsync(ms.AsRandomAccessStream());
 				return image;

src/Files.App/Utils/Shell/Win32API.cs

@@ -217,14 +217,6 @@ public static string ExtractStringFromDLL(string file, int number)
 			}
 		}
 
-		private class IconAndOverlayCacheEntry
-		{
-			public byte[]? Icon { get; set; }
-
-			public byte[]? Overlay { get; set; }
-		}
-
-		private static readonly ConcurrentDictionary<string, ConcurrentDictionary<int, IconAndOverlayCacheEntry>> _iconAndOverlayCache = new();
 
 		private static readonly object _lock = new object();
 
@@ -254,20 +246,6 @@ public static (byte[]? icon, byte[]? overlay, bool isIconCached) GetFileIconAndO
 			byte[]? iconData = null, overlayData = null;
 			bool isIconCached = false;
 
-			var entry = _iconAndOverlayCache.GetOrAdd(path, _ => new());
-
-			if (entry.TryGetValue(thumbnailSize, out var cacheEntry))
-			{
-				iconData = cacheEntry.Icon;
-				overlayData = cacheEntry.Overlay;
-
-				if ((onlyGetOverlay && overlayData is not null) ||
-					(!getOverlay && iconData is not null) ||
-					(overlayData is not null && iconData is not null))
-				{
-					return (iconData, overlayData, true);
-				}
-			}
 
 			try
 			{
@@ -386,14 +364,7 @@ public static (byte[]? icon, byte[]? overlay, bool isIconCached) GetFileIconAndO
 			}
 			finally
 			{
-				cacheEntry = new IconAndOverlayCacheEntry();
-				if (iconData is not null)
-					cacheEntry.Icon = iconData;
-
-				if (overlayData is not null)
-					cacheEntry.Overlay = overlayData;
 
-				entry[thumbnailSize] = cacheEntry;
 			}
 		}
 
@@ -525,8 +496,6 @@ public static bool SetCustomDirectoryIcon(string? folderPath, string? iconFile,
 			fcs.dwSize = (uint)Marshal.SizeOf(fcs);
 
 			var success = Shell32.SHGetSetFolderCustomSettings(ref fcs, folderPath, Shell32.FCS.FCS_FORCEWRITE).Succeeded;
-			if (success)
-				_iconAndOverlayCache[folderPath] = new();
 
 			return success;
 		}
@@ -537,8 +506,6 @@ public static bool SetCustomFileIcon(string? filePath, string? iconFile, int ico
 				return false;
 
 			var success = FileOperationsHelpers.SetLinkIcon(filePath, iconFile, iconIndex);
-			if (success)
-				_iconAndOverlayCache[filePath] = new();
 
 			return success;
 		}