Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-04 02:06:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime Bernardo
2023-06-19 20:15:12 +01:00
committed by GitHub
parent bc8e821ab4
commit c598d93ad3
8 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/modules/launcher/PowerLauncher/Images/app.dark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 166 B

BIN
src/modules/launcher/PowerLauncher/Images/app.light.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 154 B

1
src/modules/launcher/PowerLauncher/MainWindow.xaml
View File

@@ -14,7 +14,6 @@
WindowStartupLocation="Manual"
AllowDrop="True"
ShowInTaskbar="False"
Icon="Images/app.dark.png"
AllowsTransparency="True"
SourceInitialized="OnSourceInitialized"
Loaded="OnLoaded"

9
src/modules/launcher/PowerLauncher/PowerLauncher.csproj
View File

@@ -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>

2
src/modules/launcher/Wox.Infrastructure/Image/ImageCache.cs
View File

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

6
src/modules/launcher/Wox.Infrastructure/Image/ImageLoader.cs
View File

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

2
src/modules/launcher/Wox.Plugin/Constant.cs
View File

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