ControlzEx
diff --git a/‎src/ControlzEx.Showcase/App.xaml
Copy file name to clipboard
+9-75Lines changed: 9 additions & 75 deletions b/‎src/ControlzEx.Showcase/App.xaml
Copy file name to clipboard
+9-75Lines changed: 9 additions & 75 deletions
diff --git a/‎src/ControlzEx.Showcase/App.xaml.cs
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions b/‎src/ControlzEx.Showcase/App.xaml.cs
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
diff --git a/‎src/ControlzEx.Showcase/Converters/BoolToVisibilityConverter.cs
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions b/‎src/ControlzEx.Showcase/Converters/BoolToVisibilityConverter.cs
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions
diff --git a/‎src/ControlzEx.Showcase/Converters/ToBrushConverter.cs
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions b/‎src/ControlzEx.Showcase/Converters/ToBrushConverter.cs
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions
@@ -1,99 +1,33 @@
 <Application x:Class="ControlzEx.Showcase.App"
              xmlns="https://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="https://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:ControlzEx.Showcase"
              xmlns:theming="clr-namespace:ControlzEx.Showcase.Theming"
              xmlns:controlzEx="urn:controlzex"
+             xmlns:converters="clr-namespace:ControlzEx.Showcase.Converters"
              StartupUri="MainWindow.xaml"
              ShutdownMode="OnMainWindowClose">
     <Application.Resources>
         <ResourceDictionary>
             <theming:ShowcaseLibraryThemeProvider x:Key="{x:Static theming:ShowcaseLibraryThemeProvider.DefaultInstance}" />
             <theming:SecondShowcaseLibraryThemeProvider x:Key="{x:Static theming:SecondShowcaseLibraryThemeProvider.DefaultInstance}" />
 
-            <SolidColorBrush x:Key="Button.Static.Background" Color="#FFDDDDDD" />
-            <SolidColorBrush x:Key="Button.Static.Border" Color="#FF707070" />
-            <SolidColorBrush x:Key="Button.MouseOver.Background" Color="#FFBEE6FD" />
-            <SolidColorBrush x:Key="Button.MouseOver.Border" Color="#FF3C7FB1" />
-            <SolidColorBrush x:Key="Button.Pressed.Background" Color="#FFC4E5F6" />
-            <SolidColorBrush x:Key="Button.Pressed.Border" Color="#FF2C628B" />
-            <SolidColorBrush x:Key="Button.Disabled.Background" Color="#FFF4F4F4" />
-            <SolidColorBrush x:Key="Button.Disabled.Border" Color="#FFADB2B5" />
-            <SolidColorBrush x:Key="Button.Disabled.Foreground" Color="#FF838383" />
-            
-            <Style x:Key="{x:Type controlzEx:WindowChromeWindow}" TargetType="{x:Type controlzEx:WindowChromeWindow}">
-                <Setter Property="BorderThickness" Value="1" />
-                <Setter Property="BorderBrush" Value="{x:Null}" />
-                <Setter Property="NCActiveBrush" Value="{Binding Background, RelativeSource={RelativeSource Self}}" />
-                <Setter Property="NCCurrentBrush" Value="{Binding NCActiveBrush, RelativeSource={RelativeSource Self}}" />
-                <Setter Property="NCNonActiveBrush" Value="{Binding Source={x:Static SystemColors.WindowFrameBrush}}" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type controlzEx:WindowChromeWindow}">
-                            <Grid Background="{TemplateBinding Background}"
-                                  Margin="{TemplateBinding Padding}">
-                                <AdornerDecorator>
-                                    <ContentPresenter />
-                                </AdornerDecorator>
-
-                                <Border x:Name="PART_Border"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Stretch"
-                                        Background="{x:Null}"
-                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                        UseLayoutRounding="True" />
-
-                                <ResizeGrip x:Name="WindowResizeGrip"
-                                            HorizontalAlignment="Right"
-                                            VerticalAlignment="Bottom"
-                                            IsTabStop="false"
-                                            Visibility="Collapsed"
-                                            controlzEx:WindowChrome.ResizeGripDirection="BottomRight" />
-                            </Grid>
-                            <ControlTemplate.Triggers>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="Window.ResizeMode" Value="CanResizeWithGrip" />
-                                        <Condition Property="Window.WindowState" Value="Normal" />
-                                    </MultiTrigger.Conditions>
-                                    <Setter TargetName="WindowResizeGrip" Property="Visibility" Value="Visible" />
-                                </MultiTrigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-                <Style.Triggers>
-                    <Trigger Property="WindowState" Value="Maximized">
-                        <Setter Property="Margin" Value="0" />
-                    </Trigger>
-                    <!--
-                        #1823 try to fix another nasty issue
-                        WindowState = Maximized
-                        ResizeMode = NoResize
-                    -->
-                    <Trigger Property="ResizeMode" Value="NoResize">
-                        <Setter Property="Margin" Value="0" />
-                    </Trigger>
-                    <Trigger Property="IsNCActive" Value="False">
-                        <Setter Property="NCCurrentBrush" Value="{Binding NCNonActiveBrush, RelativeSource={RelativeSource Self}}" />
-                    </Trigger>
-                </Style.Triggers>
-            </Style>
-
             <Style x:Key="WindowTitleBarButton"
                    TargetType="Button">
                 <Style.Triggers>
                     <Trigger Property="controlzEx:NonClientControlProperties.IsNCMouseOver" Value="true">
-                        <Setter Property="Background" Value="{StaticResource Button.MouseOver.Background}" />
-                        <Setter Property="BorderBrush" Value="{StaticResource Button.MouseOver.Border}" />
+                        <Setter Property="Background" Value="{DynamicResource Control.MouseOver.Background}" />
+                        <Setter Property="BorderBrush" Value="{DynamicResource Control.MouseOver.Border}" />
                     </Trigger>
                     <Trigger Property="controlzEx:NonClientControlProperties.IsNCPressed" Value="true">
-                        <Setter Property="Background" Value="{StaticResource Button.Pressed.Background}" />
-                        <Setter Property="BorderBrush" Value="{StaticResource Button.Pressed.Border}" />
+                        <Setter Property="Background" Value="{DynamicResource Control.Pressed.Background}" />
+                        <Setter Property="BorderBrush" Value="{DynamicResource Control.Pressed.Border}" />
                     </Trigger>
                 </Style.Triggers>
             </Style>
+
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Themes/Controls.xaml" />
+            </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
@@ -12,6 +12,17 @@ protected override void OnStartup(StartupEventArgs e)
             ThemeManager.Current.ThemeSyncMode = ThemeSyncMode.SyncAll;
 
             ThemeManager.Current.SyncTheme();
+
+            ThemeManager.Current.ThemeChanged += CurrentOnThemeChanged;
+
+#pragma warning disable CS0618 // Type or member is obsolete
+            AppModeHelper.SyncAppMode();
+
+            void CurrentOnThemeChanged(object sender, ThemeChangedEventArgs themeChangedEventArgs)
+            {
+                AppModeHelper.SyncAppMode();
+            }
+#pragma warning restore CS0618 // Type or member is obsolete
         }
     }
 }
@@ -0,0 +1,31 @@
+namespace ControlzEx.Showcase.Converters;
+
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using ControlzEx.Internal.KnownBoxes;
+
+public class BoolToVisibilityConverter : IValueConverter
+{
+    public static readonly BoolToVisibilityConverter Instance = new();
+
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        var boolValue = (bool)value;
+
+        if (parameter is true
+            || (parameter is string stringParam && bool.TryParse(stringParam, out var boolParam) && boolParam))
+        {
+            boolValue = !boolValue;
+        }
+
+        return boolValue
+            ? VisibilityBoxes.Visible
+            : VisibilityBoxes.Collapsed;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}
@@ -0,0 +1,31 @@
+namespace ControlzEx.Showcase.Converters;
+
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+
+public class ToBrushConverter : IValueConverter
+{
+    public static readonly ToBrushConverter Instance = new();
+
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is Brush)
+        {
+            return value;
+        }
+
+        if (value is Color colorValue)
+        {
+            return new SolidColorBrush(colorValue);
+        }
+
+        return null;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,17 @@ protected override void OnStartup(StartupEventArgs e)`
`12`	`12`	`ThemeManager.Current.ThemeSyncMode = ThemeSyncMode.SyncAll;`
`13`	`13`
`14`	`14`	`ThemeManager.Current.SyncTheme();`
	`15`	`+`
	`16`	`+ ThemeManager.Current.ThemeChanged += CurrentOnThemeChanged;`
	`17`	`+`
	`18`	`+#pragma warning disable CS0618 // Type or member is obsolete`
	`19`	`+ AppModeHelper.SyncAppMode();`
	`20`	`+`
	`21`	`+ void CurrentOnThemeChanged(object sender, ThemeChangedEventArgs themeChangedEventArgs)`
	`22`	`+ {`
	`23`	`+ AppModeHelper.SyncAppMode();`
	`24`	`+ }`
	`25`	`+#pragma warning restore CS0618 // Type or member is obsolete`
`15`	`26`	`}`
`16`	`27`	`}`
`17`	`28`	`}`