diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index fa36e6b81a..74307b7181 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -883,7 +883,7 @@ - + diff --git a/src/modules/launcher/PowerLauncher/App.xaml b/src/modules/launcher/PowerLauncher/App.xaml index 31222632df..2e322001f8 100644 --- a/src/modules/launcher/PowerLauncher/App.xaml +++ b/src/modules/launcher/PowerLauncher/App.xaml @@ -1,10 +1,13 @@  + + diff --git a/src/modules/launcher/PowerLauncher/Themes/Dark.xaml b/src/modules/launcher/PowerLauncher/Themes/Dark.xaml index 04ce193d61..9aac73fcae 100644 --- a/src/modules/launcher/PowerLauncher/Themes/Dark.xaml +++ b/src/modules/launcher/PowerLauncher/Themes/Dark.xaml @@ -1,7 +1,5 @@  + public override void FillColorSchemeValues(Dictionary values, RuntimeThemeColorValues colorValues) + { + } + } +} diff --git a/src/modules/launcher/Wox.Plugin/ThemeManager.cs b/src/modules/launcher/Wox.Plugin/ThemeManager.cs index 55b3cdcc06..e83a43c0f5 100644 --- a/src/modules/launcher/Wox.Plugin/ThemeManager.cs +++ b/src/modules/launcher/Wox.Plugin/ThemeManager.cs @@ -5,7 +5,6 @@ using System; using System.Linq; using System.Windows; -using MahApps.Metro.Theming; using ManagedCommon; using Microsoft.Win32; @@ -40,27 +39,27 @@ namespace Wox.Plugin ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme( new ControlzEx.Theming.LibraryTheme( highContrastOneThemeUri, - MahAppsLibraryThemeProvider.DefaultInstance)); + CustomLibraryThemeProvider.DefaultInstance)); ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme( new ControlzEx.Theming.LibraryTheme( highContrastTwoThemeUri, - MahAppsLibraryThemeProvider.DefaultInstance)); + CustomLibraryThemeProvider.DefaultInstance)); ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme( new ControlzEx.Theming.LibraryTheme( highContrastBlackThemeUri, - MahAppsLibraryThemeProvider.DefaultInstance)); + CustomLibraryThemeProvider.DefaultInstance)); ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme( new ControlzEx.Theming.LibraryTheme( highContrastWhiteThemeUri, - MahAppsLibraryThemeProvider.DefaultInstance)); + CustomLibraryThemeProvider.DefaultInstance)); ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme( new ControlzEx.Theming.LibraryTheme( lightThemeUri, - MahAppsLibraryThemeProvider.DefaultInstance)); + CustomLibraryThemeProvider.DefaultInstance)); ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme( new ControlzEx.Theming.LibraryTheme( darkThemeUri, - MahAppsLibraryThemeProvider.DefaultInstance)); + CustomLibraryThemeProvider.DefaultInstance)); ResetTheme(); ControlzEx.Theming.ThemeManager.Current.ThemeSyncMode = ControlzEx.Theming.ThemeSyncMode.SyncAll; diff --git a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj index 8d9c037483..8aa96202ea 100644 --- a/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj +++ b/src/modules/launcher/Wox.Plugin/Wox.Plugin.csproj @@ -67,7 +67,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - all