From 429e19615c149e40076fe77a3b7768acefcb7b51 Mon Sep 17 00:00:00 2001 From: Alvin Meng <35266431+al2me6@users.noreply.github.com> Date: Wed, 22 Feb 2023 17:25:43 -0500 Subject: [PATCH] [Settings][PTRun]Show icons of user-installed plugins (#24194) --- src/modules/launcher/PowerLauncher/SettingsReader.cs | 3 +-- .../Settings.UI/ViewModels/PowerLauncherPluginViewModel.cs | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/modules/launcher/PowerLauncher/SettingsReader.cs b/src/modules/launcher/PowerLauncher/SettingsReader.cs index 8764510486..c3d3f3bbb9 100644 --- a/src/modules/launcher/PowerLauncher/SettingsReader.cs +++ b/src/modules/launcher/PowerLauncher/SettingsReader.cs @@ -215,8 +215,7 @@ namespace PowerLauncher private static string GetIcon(PluginMetadata metadata, string iconPath) { - var pluginDirectory = Path.GetFileName(metadata.PluginDirectory); - return Path.Combine(pluginDirectory, iconPath); + return Path.Combine(metadata.PluginDirectory, iconPath); } private static IEnumerable GetDefaultPluginsSettings() diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerLauncherPluginViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerLauncherPluginViewModel.cs index 5fca11a873..6988c02034 100644 --- a/src/settings-ui/Settings.UI/ViewModels/PowerLauncherPluginViewModel.cs +++ b/src/settings-ui/Settings.UI/ViewModels/PowerLauncherPluginViewModel.cs @@ -160,12 +160,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels public string IconPath { - get - { - var path = isDark() ? settings.IconPathDark : settings.IconPathLight; - path = Path.Combine(Directory.GetCurrentDirectory(), @"modules\launcher\Plugins", path); - return path; - } + get => isDark() ? settings.IconPathDark : settings.IconPathLight; } public event PropertyChangedEventHandler PropertyChanged;