diff --git a/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs b/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs index d9d22af4..3b7d4966 100644 --- a/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs +++ b/src/Shared/HandyControlDemo_Shared/Resources/DemoTheme.cs @@ -11,9 +11,9 @@ namespace HandyControlDemo.Resources public override ResourceDictionary GetSkin(SkinType skinType) => ResourceHelper.GetSkin(typeof(App).Assembly, "Resources/Themes", skinType); - public override ResourceDictionary GetTheme() => new ResourceDictionary + public override ResourceDictionary GetTheme() => new Lazy(() => new ResourceDictionary { Source = new Uri("pack://application:,,,/HandyControlDemo;component/Resources/Themes/Theme.xaml") - }; + }).Value; } } diff --git a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs index f8348369..668117e1 100644 --- a/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs +++ b/src/Shared/HandyControl_Shared/Controls/ColorPicker/ColorPicker.cs @@ -455,7 +455,7 @@ namespace HandyControl.Controls var button = new Button { Margin = new Thickness(6), - Style = ResourceHelper.GetResource