A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Fixed an issue where SVG icons were flickering when the NavigationView was collapsed. (#109)
Etienne Baudoux731234faad2c
diff --git a/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs b/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.csindex fe0403b19..88c179198 100644--- a/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs+++ b/src/dev/impl/DevToys/ViewModels/Tools/ToolProviderBase.cs@@ -1,6 +1,8 @@#nullable enableusing System;+using System.Collections.Generic;+using System.Diagnostics;using System.IO;using System.Numerics;using System.Threading.Tasks;@@ -20,8 +22,11 @@ namespace DevToys.ViewModels.Tools{internal abstract class ToolProviderBase{+ private const int IconMinimalSize = 16;protected const string AssetsFolderPath = "ms-appx:///Assets/";+ private static readonly Dictionary<string, string> IconFileNameToSvgMap = new();+protected TaskCompletionNotifier<IconElement> CreatePathIconFromPath(string resourceName){Arguments.NotNullOrWhiteSpace(resourceName, nameof(resourceName));@@ -66,13 +71,17 @@ namespace DevToys.ViewModels.ToolsElementTheme actualTheme = windowFrame.ActualTheme;return Task.Run(async () =>{- await TaskScheduler.Default;+ if (!IconFileNameToSvgMap.TryGetValue(iconFileName, out string svgFileContent))+ {+ await TaskScheduler.Default;- StorageFolder installationFolder = Windows.ApplicationModel.Package.Current.InstalledLocation;+ StorageFolder installationFolder = Windows.ApplicationModel.Package.Current.InstalledLocation;- IStorageItem file = await installationFolder.TryGetItemAsync("Assets\\Icons\\" + iconFileName);+ IStorageItem file = await installationFolder.TryGetItemAsync("Assets\\Icons\\" + iconFileName);- string svgFileContent = File.ReadAllText(file.Path);+ svgFileContent = File.ReadAllText(file.Path);+ IconFileNameToSvgMap[iconFileName] = svgFileContent;+ }if (actualTheme == ElementTheme.Dark){@@ -83,7 +92,7 @@ namespace DevToys.ViewModels.ToolssvgFileContent = svgFileContent.Replace("#ffffff", "#000000").Replace("#FFFFFFFF", "#000000");}- return await ThreadHelper.RunOnUIThreadAsync(ThreadPriority.High, async () =>+ return await ThreadHelper.RunOnUIThreadAsync(ThreadPriority.Low, async () =>{var svgSource = new SvgImageSource();@@ -107,6 +116,11 @@ namespace DevToys.ViewModels.ToolsnewSize = parent.ActualSize.ToSize();}+ if (newSize.Width < IconMinimalSize || newSize.Height < IconMinimalSize)+ {+ return;+ }+svgSource = new SvgImageSource();svgSource.RasterizePixelHeight = newSize.Height;svgSource.RasterizePixelWidth = newSize.Width;