[PTRun]Remove default images (app.dark.png fix) (#26843)

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"

src/modules/launcher/PowerLauncher/PowerLauncher.csproj

@@ -53,9 +53,6 @@
 
   <ItemGroup>
     <None Remove="app.png" />
-    <None Remove="Images\app.dark.png" />
-    <None Remove="Images\app.light.png" />
-    <None Remove="Images\app.light1.png" />
     <None Remove="Images\app_error.dark.png" />
     <None Remove="Images\app_error.light.png" />
     <None Remove="Images\RunResource.ico" />
@@ -65,12 +62,6 @@
     <Content Include="app.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Images\app.dark.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\app.light.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Images\app_error.dark.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

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 _);
                         }

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;
             }
         }
 

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");
     }
 }

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<std::string_view, 4> assetsToCheck = { "modules\\launcher\\Images\\app.dark.png",
+        constexpr std::array<std::string_view, 2> assetsToCheck = { "modules\\launcher\\Images\\app_error.dark.png",
-                                                                    "modules\\launcher\\Images\\app.light.png",
-                                                                    "modules\\launcher\\Images\\app_error.dark.png",
                                                                     "modules\\launcher\\Images\\app_error.light.png" };
         for (const auto asset : assetsToCheck)
         {