diff --git a/src/modules/launcher/PowerLauncher/Images/app.dark.png b/src/modules/launcher/PowerLauncher/Images/app.dark.png deleted file mode 100644 index 49a0a39e6d..0000000000 Binary files a/src/modules/launcher/PowerLauncher/Images/app.dark.png and /dev/null differ diff --git a/src/modules/launcher/PowerLauncher/Images/app.light.png b/src/modules/launcher/PowerLauncher/Images/app.light.png deleted file mode 100644 index ccf9473831..0000000000 Binary files a/src/modules/launcher/PowerLauncher/Images/app.light.png and /dev/null differ diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml b/src/modules/launcher/PowerLauncher/MainWindow.xaml index b677844d76..2c9db3e755 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml @@ -14,7 +14,6 @@ WindowStartupLocation="Manual" AllowDrop="True" ShowInTaskbar="False" - Icon="Images/app.dark.png" AllowsTransparency="True" SourceInitialized="OnSourceInitialized" Loaded="OnLoaded" diff --git a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj index e5c181a31a..34e6d60727 100644 --- a/src/modules/launcher/PowerLauncher/PowerLauncher.csproj +++ b/src/modules/launcher/PowerLauncher/PowerLauncher.csproj @@ -53,9 +53,6 @@ - - - @@ -65,12 +62,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest diff --git a/src/modules/launcher/Wox.Infrastructure/Image/ImageCache.cs b/src/modules/launcher/Wox.Infrastructure/Image/ImageCache.cs index 4daf97959f..5cbae92a49 100644 --- a/src/modules/launcher/Wox.Infrastructure/Image/ImageCache.cs +++ b/src/modules/launcher/Wox.Infrastructure/Image/ImageCache.cs @@ -53,7 +53,7 @@ namespace Wox.Infrastructure.Image foreach (var key in _data.Keys) { // Using Ordinal since this is internal - if (!Usage.TryGetValue(key, out _) && !(key.Equals(Constant.ErrorIcon, StringComparison.Ordinal) || key.Equals(Constant.DefaultIcon, StringComparison.Ordinal) || key.Equals(Constant.LightThemedErrorIcon, StringComparison.Ordinal) || key.Equals(Constant.LightThemedDefaultIcon, StringComparison.Ordinal))) + if (!Usage.TryGetValue(key, out _) && !(key.Equals(Constant.ErrorIcon, StringComparison.Ordinal) || key.Equals(Constant.LightThemedErrorIcon, StringComparison.Ordinal))) { _data.TryRemove(key, out _); } diff --git a/src/modules/launcher/Wox.Infrastructure/Image/ImageLoader.cs b/src/modules/launcher/Wox.Infrastructure/Image/ImageLoader.cs index fab64e67f1..2a6e760336 100644 --- a/src/modules/launcher/Wox.Infrastructure/Image/ImageLoader.cs +++ b/src/modules/launcher/Wox.Infrastructure/Image/ImageLoader.cs @@ -32,8 +32,6 @@ namespace Wox.Infrastructure.Image public static string ErrorIconPath { get; set; } - public static string DefaultIconPath { get; set; } - private static readonly string[] ImageExtensions = { ".png", @@ -49,7 +47,7 @@ namespace Wox.Infrastructure.Image { _hashGenerator = new ImageHashGenerator(); - foreach (var icon in new[] { Constant.DefaultIcon, Constant.ErrorIcon, Constant.LightThemedDefaultIcon, Constant.LightThemedErrorIcon }) + foreach (var icon in new[] { Constant.ErrorIcon, Constant.LightThemedErrorIcon }) { BitmapImage bmi = new BitmapImage(); bmi.BeginInit(); @@ -88,12 +86,10 @@ namespace Wox.Infrastructure.Image if (theme == Theme.Light || theme == Theme.HighContrastWhite) { ErrorIconPath = Constant.LightThemedErrorIcon; - DefaultIconPath = Constant.LightThemedDefaultIcon; } else { ErrorIconPath = Constant.ErrorIcon; - DefaultIconPath = Constant.DefaultIcon; } } diff --git a/src/modules/launcher/Wox.Plugin/Constant.cs b/src/modules/launcher/Wox.Plugin/Constant.cs index f66d9b36ad..8f37b72fc7 100644 --- a/src/modules/launcher/Wox.Plugin/Constant.cs +++ b/src/modules/launcher/Wox.Plugin/Constant.cs @@ -63,9 +63,7 @@ namespace Wox.Plugin public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion; public static readonly int ThumbnailSize = 64; - public static readonly string DefaultIcon = Path.Combine(ProgramDirectory, "Images", "app.dark.png"); public static readonly string ErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.dark.png"); - public static readonly string LightThemedDefaultIcon = Path.Combine(ProgramDirectory, "Images", "app.light.png"); public static readonly string LightThemedErrorIcon = Path.Combine(ProgramDirectory, "Images", "app_error.light.png"); } } diff --git a/src/runner/main.cpp b/src/runner/main.cpp index d97dc7b4f4..5b8fa6d7b6 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -95,9 +95,7 @@ void debug_verify_launcher_assets() { namespace fs = std::filesystem; const fs::path powertoysRoot = get_module_folderpath(); - constexpr std::array assetsToCheck = { "modules\\launcher\\Images\\app.dark.png", - "modules\\launcher\\Images\\app.light.png", - "modules\\launcher\\Images\\app_error.dark.png", + constexpr std::array assetsToCheck = { "modules\\launcher\\Images\\app_error.dark.png", "modules\\launcher\\Images\\app_error.light.png" }; for (const auto asset : assetsToCheck) {