From d693312338b833b1ae99578d8021d479a8921120 Mon Sep 17 00:00:00 2001 From: cuiliang Date: Wed, 11 Aug 2021 14:38:45 +0800 Subject: [PATCH] Avoid duplicated ResourceDictionary --- .../Tools/Helper/ResourceHelper.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs b/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs index 18c60220..9bdb4b87 100644 --- a/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs +++ b/src/Shared/HandyControl_Shared/Tools/Helper/ResourceHelper.cs @@ -79,12 +79,24 @@ namespace HandyControl.Tools Source = new Uri($"pack://application:,,,/HandyControl;component/Themes/Skin{skin}.xaml") }; + + + private static ResourceDictionary _theme; + /// /// get HandyControl theme /// - public static ResourceDictionary GetTheme() => new() + public static ResourceDictionary GetTheme() { - Source = new Uri("pack://application:,,,/HandyControl;component/Themes/Theme.xaml") - }; + if (_theme == null) + { + _theme = new() + { + Source = new Uri("pack://application:,,,/HandyControl;component/Themes/Theme.xaml") + }; + } + + return _theme; + } } }