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

fix js based application logo #198

Browse Source
This commit is contained in:
bao-qian
2016-09-05 17:45:29 +01:00
parent 1e01f94540
commit 0d687eb348
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Plugins/Wox.Plugin.Program/Programs/UWP.cs
View File

@@ -81,6 +81,7 @@ namespace Wox.Plugin.Program.Programs
{ {
Apps[i].UserModelId = currentApp.GetAppUserModelId(); Apps[i].UserModelId = currentApp.GetAppUserModelId();
Apps[i].BackgroundColor = currentApp.GetStringValue("BackgroundColor") ?? string.Empty; Apps[i].BackgroundColor = currentApp.GetStringValue("BackgroundColor") ?? string.Empty;
// todo use hidpi logo when use hidpi screen
Apps[i].LogoPath = Path.Combine(Location, currentApp.GetStringValue("Square44x44Logo")); Apps[i].LogoPath = Path.Combine(Location, currentApp.GetStringValue("Square44x44Logo"));
Apps[i].Location = Location; Apps[i].Location = Location;
} }
@@ -280,7 +281,6 @@ namespace Wox.Plugin.Program.Programs
public ImageSource Logo() public ImageSource Logo()
{ {
var logo = !string.IsNullOrEmpty(LogoPath) ? ImageFromPath(LogoPath) : ImageFromStream(LogoStream); var logo = !string.IsNullOrEmpty(LogoPath) ? ImageFromPath(LogoPath) : ImageFromStream(LogoStream);
var validBaground = !string.IsNullOrEmpty(BackgroundColor) && BackgroundColor != "transparent"; var validBaground = !string.IsNullOrEmpty(BackgroundColor) && BackgroundColor != "transparent";
var plated = validBaground ? PlatedImage(logo) : logo; var plated = validBaground ? PlatedImage(logo) : logo;
@@ -291,25 +291,34 @@ namespace Wox.Plugin.Program.Programs
private BitmapImage ImageFromPath(string path) private BitmapImage ImageFromPath(string path)
{ {
// https://msdn.microsoft.com/windows/uwp/controls-and-patterns/tiles-and-notifications-app-assets if (!File.Exists(path))
var extension = path.Substring(path.Length - 4);
var filename = path.Substring(0, path.Length - 4);
// todo: remove hard cod scale
var path1 = $"{filename}.scale-200{extension}";
var path2 = $"{filename}.scale-100{extension}";
if (File.Exists(path1))
{ {
var image = new BitmapImage(new Uri(path1)); // https://msdn.microsoft.com/windows/uwp/controls-and-patterns/tiles-and-notifications-app-assets
return image; var extension = path.Substring(path.Length - 4);
} var filename = path.Substring(0, path.Length - 4);
else if (File.Exists(path2)) // todo: remove hard cod scale
{ var path1 = $"{filename}.scale-200{extension}";
var image = new BitmapImage(new Uri(path2)); var path2 = $"{filename}.scale-100{extension}";
return image; if (File.Exists(path1))
{
var image = new BitmapImage(new Uri(path1));
return image;
}
else if (File.Exists(path2))
{
var image = new BitmapImage(new Uri(path2));
return image;
}
else
{
return new BitmapImage(new Uri(Constant.ErrorIcon));
}
} }
else else
{ {
return new BitmapImage(new Uri(Constant.ErrorIcon)); // for js based application, e.g cut the rope
var image = new BitmapImage(new Uri(path));
return image;
} }
} }