[FanzyZones] Common ThemeManager (#9576)

* common ThemeManager in FancyZones editor

* fix high contrast theme

.pipelines/pipeline.user.windows.yml

@@ -80,6 +80,7 @@ build:
             - 'modules\FancyZones\FancyZonesEditor.dll'
             - 'modules\FancyZones\ManagedCommon.dll'
             - 'modules\FancyZones\Telemetry.dll'
+            - 'modules\FancyZones\Microsoft.PowerToys.Common.UI.dll'
             - 'modules\FileExplorerPreview\MarkdownPreviewHandler.dll'
             - 'modules\FileExplorerPreview\MarkdownPreviewHandler.comhost.dll'
             - 'modules\FileExplorerPreview\powerpreview.dll'

installer/PowerToysSetup/Product.wxs

@@ -379,6 +379,7 @@
         <File Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\ModernWpf.Controls.dll" />
         <File Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\System.Text.Json.dll" />
         <File Id="FancyZones_ManagedCommon" Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\ManagedCommon.dll" />
+        <File Id="FancyZones_Microsoft.PowerToys.Common.UI" Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\Microsoft.PowerToys.Common.UI.dll" />
         <File Id="FancyZones_Telemetry.dll" Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\ManagedTelemetry.dll" />
         <File Id="FancyZone_System.IO.Abstractions.dll" Source="$(var.BinX64Dir)modules\$(var.FancyZonesProjectName)\System.IO.Abstractions.dll" />
       </Component>

src/common/Microsoft.PowerToys.Common.UI/Microsoft.PowerToys.Common.UI.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+  <Import Project="..\..\Version.props" />
   
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>

src/common/Microsoft.PowerToys.Common.UI/ThemeManager.cs

@@ -133,22 +133,22 @@ namespace Microsoft.PowerToys.Common.UI
             else if (theme == Theme.HighContrastOne)
             {
                 _currentTheme = Theme.HighContrastOne;
-                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastOneTheme, true);
+                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastOneTheme);
             }
             else if (theme == Theme.HighContrastTwo)
             {
                 _currentTheme = Theme.HighContrastTwo;
-                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastTwoTheme, true);
+                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastTwoTheme);
             }
             else if (theme == Theme.HighContrastWhite)
             {
                 _currentTheme = Theme.HighContrastWhite;
-                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastWhiteTheme, true);
+                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastWhiteTheme);
             }
             else if (theme == Theme.HighContrastBlack)
             {
                 _currentTheme = Theme.HighContrastBlack;
-                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastBlackTheme, true);
+                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastBlackTheme);
             }
             else if (theme == Theme.Light)
             {

src/modules/fancyzones/editor/FancyZonesEditor/App.xaml.cs

@@ -14,6 +14,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using FancyZonesEditor.Utils;
 using ManagedCommon;
+using Microsoft.PowerToys.Common.UI;
 
 namespace FancyZonesEditor
 {

src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj

@@ -65,7 +65,6 @@
     </AdditionalFiles>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ControlzEx" Version="4.4.0" />
     <PackageReference Include="ModernWpfUI" Version="0.9.3" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
@@ -79,6 +78,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
+    <ProjectReference Include="..\..\..\..\common\Microsoft.PowerToys.Common.UI\Microsoft.PowerToys.Common.UI.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">

src/modules/fancyzones/editor/FancyZonesEditor/Utils/CustomLibraryThemeProvider.cs

@@ -1,24 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Collections.Generic;
-using ControlzEx.Theming;
-
-namespace FancyZonesEditor.Utils
-{
-    public class CustomLibraryThemeProvider : LibraryThemeProvider
-    {
-        public static readonly CustomLibraryThemeProvider DefaultInstance = new CustomLibraryThemeProvider();
-
-        public CustomLibraryThemeProvider()
-            : base(true)
-        {
-        }
-
-        /// <inheritdoc />
-        public override void FillColorSchemeValues(Dictionary<string, string> values, RuntimeThemeColorValues colorValues)
-        {
-        }
-    }
-}

src/modules/fancyzones/editor/FancyZonesEditor/Utils/ThemeManager.cs

@@ -1,200 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-using System;
-using System.Linq;
-using System.Windows;
-using ControlzEx.Theming;
-using Microsoft.Win32;
-
-namespace FancyZonesEditor.Utils
-{
-    public class ThemeManager : IDisposable
-    {
-        private readonly Application _app;
-        private const string LightTheme = "Light.Accent1";
-        private const string DarkTheme = "Dark.Accent1";
-        private const string HighContrastOneTheme = "HighContrast.Accent2";
-        private const string HighContrastTwoTheme = "HighContrast.Accent3";
-        private const string HighContrastBlackTheme = "HighContrast.Accent4";
-        private const string HighContrastWhiteTheme = "HighContrast.Accent5";
-
-        private Theme currentTheme;
-        private bool _disposed;
-
-        public event ThemeChangedHandler ThemeChanged;
-
-        public ThemeManager(Application app)
-        {
-            _app = app;
-
-            Uri highContrastOneThemeUri = new Uri("pack://application:,,,/Themes/HighContrast1.xaml");
-            Uri highContrastTwoThemeUri = new Uri("pack://application:,,,/Themes/HighContrast2.xaml");
-            Uri highContrastBlackThemeUri = new Uri("pack://application:,,,/Themes/HighContrastWhite.xaml");
-            Uri highContrastWhiteThemeUri = new Uri("pack://application:,,,/Themes/HighContrastBlack.xaml");
-            Uri lightThemeUri = new Uri("pack://application:,,,/Themes/Light.xaml");
-            Uri darkThemeUri = new Uri("pack://application:,,,/Themes/Dark.xaml");
-
-            ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme(
-                new LibraryTheme(
-                    highContrastOneThemeUri,
-                    CustomLibraryThemeProvider.DefaultInstance));
-            ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme(
-                new LibraryTheme(
-                    highContrastTwoThemeUri,
-                    CustomLibraryThemeProvider.DefaultInstance));
-            ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme(
-                new LibraryTheme(
-                    highContrastBlackThemeUri,
-                    CustomLibraryThemeProvider.DefaultInstance));
-            ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme(
-                new LibraryTheme(
-                    highContrastWhiteThemeUri,
-                    CustomLibraryThemeProvider.DefaultInstance));
-            ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme(
-                new LibraryTheme(
-                    lightThemeUri,
-                    CustomLibraryThemeProvider.DefaultInstance));
-            ControlzEx.Theming.ThemeManager.Current.AddLibraryTheme(
-                new LibraryTheme(
-                    darkThemeUri,
-                    CustomLibraryThemeProvider.DefaultInstance));
-
-            ResetTheme();
-            ControlzEx.Theming.ThemeManager.Current.ThemeSyncMode = ThemeSyncMode.SyncWithAppMode;
-            ControlzEx.Theming.ThemeManager.Current.ThemeChanged += Current_ThemeChanged;
-            SystemParameters.StaticPropertyChanged += SystemParameters_StaticPropertyChanged;
-        }
-
-        private void SystemParameters_StaticPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == nameof(SystemParameters.HighContrast))
-            {
-                ResetTheme();
-            }
-        }
-
-        public Theme GetCurrentTheme()
-        {
-            return currentTheme;
-        }
-
-        private static Theme GetHighContrastBaseType()
-        {
-            string registryKey = @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Themes";
-            string theme = (string)Registry.GetValue(registryKey, "CurrentTheme", string.Empty);
-            theme = theme.Split('\\').Last().Split('.').First().ToString();
-
-            switch (theme)
-            {
-                case "hc1":
-                    return Theme.HighContrastOne;
-                case "hc2":
-                    return Theme.HighContrastTwo;
-                case "hcwhite":
-                    return Theme.HighContrastWhite;
-                case "hcblack":
-                    return Theme.HighContrastBlack;
-                default:
-                    return Theme.None;
-            }
-        }
-
-        private void ResetTheme()
-        {
-            if (SystemParameters.HighContrast)
-            {
-                Theme highContrastBaseType = GetHighContrastBaseType();
-                ChangeTheme(highContrastBaseType);
-            }
-            else
-            {
-                string baseColor = WindowsThemeHelper.GetWindowsBaseColor();
-                ChangeTheme((Theme)Enum.Parse(typeof(Theme), baseColor));
-            }
-        }
-
-        private void ChangeTheme(Theme theme)
-        {
-            Theme oldTheme = currentTheme;
-            if (theme == currentTheme)
-            {
-                return;
-            }
-
-            if (theme == Theme.HighContrastOne)
-            {
-                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastOneTheme);
-                currentTheme = Theme.HighContrastOne;
-            }
-            else if (theme == Theme.HighContrastTwo)
-            {
-                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastTwoTheme);
-                currentTheme = Theme.HighContrastTwo;
-            }
-            else if (theme == Theme.HighContrastWhite)
-            {
-                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastWhiteTheme);
-                currentTheme = Theme.HighContrastWhite;
-            }
-            else if (theme == Theme.HighContrastBlack)
-            {
-                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, HighContrastBlackTheme);
-                currentTheme = Theme.HighContrastBlack;
-            }
-            else if (theme == Theme.Light)
-            {
-                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, LightTheme);
-                currentTheme = Theme.Light;
-            }
-            else if (theme == Theme.Dark)
-            {
-                ControlzEx.Theming.ThemeManager.Current.ChangeTheme(_app, DarkTheme);
-                currentTheme = Theme.Dark;
-            }
-            else
-            {
-                currentTheme = Theme.None;
-            }
-
-            ThemeChanged?.Invoke(oldTheme, currentTheme);
-        }
-
-        private void Current_ThemeChanged(object sender, ThemeChangedEventArgs e)
-        {
-            ResetTheme();
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!_disposed)
-            {
-                if (disposing)
-                {
-                    ControlzEx.Theming.ThemeManager.Current.ThemeChanged -= Current_ThemeChanged;
-                    SystemParameters.StaticPropertyChanged -= SystemParameters_StaticPropertyChanged;
-                    _disposed = true;
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(disposing: true);
-            GC.SuppressFinalize(this);
-        }
-    }
-
-    public delegate void ThemeChangedHandler(Theme oldTheme, Theme newTheme);
-
-    public enum Theme
-    {
-        None,
-        Light,
-        Dark,
-        HighContrastOne,
-        HighContrastTwo,
-        HighContrastBlack,
-        HighContrastWhite,
-    }
-}

src/modules/launcher/PowerLauncher/Themes/HighContrast1.xaml

@@ -12,7 +12,6 @@
     <system:String x:Key="Theme.BaseColorScheme">HighContrast</system:String>
     <system:String x:Key="Theme.ColorScheme">Accent2</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
-    <system:Boolean x:Key="Theme.IsHighContrast">True</system:Boolean>
 
     <Color x:Key="SystemBaseMediumLowColor">#ffff00</Color>
     <SolidColorBrush x:Key="SystemChromeLow" Color="Black" options:Freeze="True" />

src/modules/launcher/PowerLauncher/Themes/HighContrast2.xaml

@@ -12,7 +12,6 @@
     <system:String x:Key="Theme.BaseColorScheme">HighContrast</system:String>
     <system:String x:Key="Theme.ColorScheme">Accent3</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
-    <system:Boolean x:Key="Theme.IsHighContrast">True</system:Boolean>
 
     <Color x:Key="SystemBaseMediumLowColor">#ffff00</Color>
     <SolidColorBrush x:Key="SystemChromeLow" Color="Black" options:Freeze="True" />

src/modules/launcher/PowerLauncher/Themes/HighContrastBlack.xaml

@@ -12,7 +12,6 @@
     <system:String x:Key="Theme.BaseColorScheme">HighContrast</system:String>
     <system:String x:Key="Theme.ColorScheme">Accent4</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
-    <system:Boolean x:Key="Theme.IsHighContrast">True</system:Boolean>
 
     <Color x:Key="SystemBaseMediumLowColor">#66FFFFFF</Color>
     <SolidColorBrush x:Key="SystemChromeLow" Color="Black" options:Freeze="True" />

src/modules/launcher/PowerLauncher/Themes/HighContrastWhite.xaml

@@ -12,7 +12,6 @@
     <system:String x:Key="Theme.BaseColorScheme">HighContrast</system:String>
     <system:String x:Key="Theme.ColorScheme">Accent5</system:String>
     <Color x:Key="Theme.PrimaryAccentColor">White</Color>
-    <system:Boolean x:Key="Theme.IsHighContrast">True</system:Boolean>
 
     <Color x:Key="SystemBaseMediumLowColor">#66000000</Color>
     <SolidColorBrush x:Key="SystemChromeLow" Color="White" options:Freeze="True" />