mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-14 19:49:15 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix FindResource

Browse Source 
http://windowsasusual.blogspot.ie/2015/10/wpf-applicationcurrentfindresource-and.html
This commit is contained in:
bao-qian 2015-11-29 08:20:13 +00:00
parent 5b8fa5ec8d
commit 7b386c4f41
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,18 +59,13 @@ namespace Wox.Core.Theme
UserSettingStorage.Instance.Save(); UserSettingStorage.Instance.Save();
ResourceMerger.UpdateResource(this); ResourceMerger.UpdateResource(this);
try // Exception of FindResource can't be cathed if global exception handle is set
{ var isBlur = Application.Current.TryFindResource("ThemeBlurEnabled");
var isBlur = Application.Current.FindResource("ThemeBlurEnabled");
if (isBlur is bool) if (isBlur is bool)
{ {
SetBlurForWindow(Application.Current.MainWindow, (bool)isBlur); SetBlurForWindow(Application.Current.MainWindow, (bool)isBlur);
} }
} }
catch (ResourceReferenceKeyNotFoundException e)
{
}
}
public ResourceDictionary GetResourceDictionary() public ResourceDictionary GetResourceDictionary()
{ {

11
Wox.Core/i18n/Internationalization.cs
View File

@ -88,20 +88,15 @@ namespace Wox.Core.i18n
public string GetTranslation(string key) public string GetTranslation(string key)
{ {
try var translation = Application.Current.TryFindResource(key);
if (translation is string)
{ {
object translation = Application.Current.FindResource(key);
if (translation == null)
{
return "NoTranslation";
}
return translation.ToString(); return translation.ToString();
} }
catch else
{ {
return "NoTranslation"; return "NoTranslation";
} }
} }
private string GetLanguagePath(string languageCode) private string GetLanguagePath(string languageCode)