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 ResourceMerger

Browse Source 
1. Fix duplication for loading resource.
2. Fix null reference when plugin is not loaded.
3. speedup.
This commit is contained in:
bao-qian
2015-11-02 02:49:38 +00:00
parent b5a8312167
commit 881e414043
5 changed files with 43 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Wox.Core/Theme/Theme.cs
View File

@@ -14,11 +14,12 @@ namespace Wox.Core.Theme
{
public class Theme : IUIResource,ITheme
{
public const string DirectoryName = "Themes";
private static List<string> themeDirectories = new List<string>();
static Theme()
{
themeDirectories.Add(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Themes"));
themeDirectories.Add(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), DirectoryName));
MakesureThemeDirectoriesExist();
}
@@ -55,7 +56,7 @@ namespace Wox.Core.Theme
UserSettingStorage.Instance.Theme = themeName;
UserSettingStorage.Instance.Save();
ResourceMerger.ApplyResources();
ResourceMerger.ApplyThemeResource();
}
public ResourceDictionary GetResourceDictionary()