Browse Source

more cleanup

pull/7256/head
Takoooooo 5 years ago
parent
commit
3bfafc5f93
  1. 28
      samples/ControlCatalog/MainView.xaml.cs

28
samples/ControlCatalog/MainView.xaml.cs

@ -44,34 +44,22 @@ namespace ControlCatalog
var themeStyle = Application.Current.Styles[0]; var themeStyle = Application.Current.Styles[0];
if (theme == CatalogTheme.FluentLight) if (theme == CatalogTheme.FluentLight)
{ {
if (themeStyle is FluentTheme fluentTheme) if (App.Fluent.Mode != FluentThemeMode.Light)
{ {
if (fluentTheme.Mode == FluentThemeMode.Dark) App.Fluent.Mode = FluentThemeMode.Light;
{
fluentTheme.Mode = FluentThemeMode.Light;
}
}
else
{
Application.Current.Styles[0] = App.Fluent;
Application.Current.Styles[1] = App.DataGridFluent;
} }
Application.Current.Styles[0] = App.Fluent;
Application.Current.Styles[1] = App.DataGridFluent;
} }
else if (theme == CatalogTheme.FluentDark) else if (theme == CatalogTheme.FluentDark)
{ {
if (themeStyle is FluentTheme fluentTheme)
{ if (App.Fluent.Mode != FluentThemeMode.Dark)
if (fluentTheme.Mode == FluentThemeMode.Light)
{
fluentTheme.Mode = FluentThemeMode.Dark;
}
}
else
{ {
App.Fluent.Mode = FluentThemeMode.Dark; App.Fluent.Mode = FluentThemeMode.Dark;
Application.Current.Styles[0] = App.Fluent;
Application.Current.Styles[1] = App.DataGridFluent;
} }
Application.Current.Styles[0] = App.Fluent;
Application.Current.Styles[1] = App.DataGridFluent;
} }
else if (theme == CatalogTheme.DefaultLight) else if (theme == CatalogTheme.DefaultLight)
{ {

Loading…
Cancel
Save