Fix ToggleButton style not showing IsChecked state (#8)

Fixes #8
gix · Apr 10, 2022 · f96672b · f96672b
1 parent 0a3a004
commit f96672b
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [vNext]
+### Fixed
+- ToggleButton style does not show IsCheckes state. (#8)
+
 ## [0.6.3] - 2021-07-04
 ### Fixed
 - ThemeManager hooking now works on .NET 5+.

diff --git a/Source/PresentationTheme.Aero.Win10/Themes/Aero.Win10.NormalColor.xaml b/Source/PresentationTheme.Aero.Win10/Themes/Aero.Win10.NormalColor.xaml
@@ -470,7 +470,8 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ButtonBase}">
-          <aero10:ButtonChrome Style="{StaticResource {x:Type aero10:ButtonChrome}}"
+          <aero10:ButtonChrome x:Name="ButtonChrome"
+                               Style="{StaticResource {x:Type aero10:ButtonChrome}}"
                                Focusable="False"
                                Background="{TemplateBinding Background}"
                                BorderBrush="{TemplateBinding BorderBrush}"
@@ -485,6 +486,11 @@
                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                ContentTemplate="{TemplateBinding ContentTemplate}"
                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
+          <ControlTemplate.Triggers>
+            <Trigger Property="ToggleButton.IsChecked" Value="True">
+              <Setter TargetName="ButtonChrome" Property="RenderPressed" Value="True"/>
+            </Trigger>
+          </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
     </Setter>

diff --git a/Source/PresentationTheme.Aero.Win8/Themes/Aero.Win8.NormalColor.xaml b/Source/PresentationTheme.Aero.Win8/Themes/Aero.Win8.NormalColor.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary
+<ResourceDictionary
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:system="clr-namespace:System;assembly=mscorlib"
@@ -479,7 +479,8 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ButtonBase}">
-          <aero8:ButtonChrome Style="{StaticResource {x:Type aero8:ButtonChrome}}"
+          <aero8:ButtonChrome x:Name="ButtonChrome"
+                              Style="{StaticResource {x:Type aero8:ButtonChrome}}"
                               Focusable="False"
                               Background="{TemplateBinding Background}"
                               BorderBrush="{TemplateBinding BorderBrush}"
@@ -494,6 +495,11 @@
                               ContentStringFormat="{TemplateBinding ContentStringFormat}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
                               ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
+          <ControlTemplate.Triggers>
+            <Trigger Property="ToggleButton.IsChecked" Value="True">
+              <Setter TargetName="ButtonChrome" Property="RenderPressed" Value="True"/>
+            </Trigger>
+          </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
     </Setter>

diff --git a/Source/PresentationTheme.AeroLite.Win10/Themes/AeroLite.Win10.NormalColor.xaml b/Source/PresentationTheme.AeroLite.Win10/Themes/AeroLite.Win10.NormalColor.xaml
@@ -372,7 +372,8 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ButtonBase}">
-          <aero10:ButtonChrome Style="{StaticResource {x:Type aero10:ButtonChrome}}"
+          <aero10:ButtonChrome x:Name="ButtonChrome"
+                               Style="{StaticResource {x:Type aero10:ButtonChrome}}"
                                Focusable="False"
                                Background="{TemplateBinding Background}"
                                BorderBrush="{TemplateBinding BorderBrush}"
@@ -387,6 +388,11 @@
                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                ContentTemplate="{TemplateBinding ContentTemplate}"
                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
+          <ControlTemplate.Triggers>
+            <Trigger Property="ToggleButton.IsChecked" Value="True">
+              <Setter TargetName="ButtonChrome" Property="RenderPressed" Value="True"/>
+            </Trigger>
+          </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
     </Setter>

diff --git a/Source/PresentationTheme.AeroLite.Win8/Themes/AeroLite.Win8.NormalColor.xaml b/Source/PresentationTheme.AeroLite.Win8/Themes/AeroLite.Win8.NormalColor.xaml
@@ -372,7 +372,8 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ButtonBase}">
-          <aero8:ButtonChrome Style="{StaticResource {x:Type aero8:ButtonChrome}}"
+          <aero8:ButtonChrome x:Name="ButtonChrome"
+                              Style="{StaticResource {x:Type aero8:ButtonChrome}}"
                               Focusable="False"
                               Background="{TemplateBinding Background}"
                               BorderBrush="{TemplateBinding BorderBrush}"
@@ -387,6 +388,11 @@
                               ContentStringFormat="{TemplateBinding ContentStringFormat}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
                               ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
+          <ControlTemplate.Triggers>
+            <Trigger Property="ToggleButton.IsChecked" Value="True">
+              <Setter TargetName="ButtonChrome" Property="RenderPressed" Value="True"/>
+            </Trigger>
+          </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
     </Setter>

diff --git a/Source/PresentationTheme.HighContrast.Win10/Themes/HighContrast.Win10.NormalColor.xaml b/Source/PresentationTheme.HighContrast.Win10/Themes/HighContrast.Win10.NormalColor.xaml
@@ -362,7 +362,8 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ButtonBase}">
-          <aero10:ButtonChrome Style="{StaticResource {x:Type aero10:ButtonChrome}}"
+          <aero10:ButtonChrome x:Name="ButtonChrome"
+                               Style="{StaticResource {x:Type aero10:ButtonChrome}}"
                                Focusable="False"
                                Background="{TemplateBinding Background}"
                                BorderBrush="{TemplateBinding BorderBrush}"
@@ -377,6 +378,11 @@
                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
                                ContentTemplate="{TemplateBinding ContentTemplate}"
                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
+          <ControlTemplate.Triggers>
+            <Trigger Property="ToggleButton.IsChecked" Value="True">
+              <Setter TargetName="ButtonChrome" Property="RenderPressed" Value="True"/>
+            </Trigger>
+          </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
     </Setter>

diff --git a/Source/PresentationTheme.HighContrast.Win8/Themes/HighContrast.Win8.NormalColor.xaml b/Source/PresentationTheme.HighContrast.Win8/Themes/HighContrast.Win8.NormalColor.xaml
@@ -362,7 +362,8 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type ButtonBase}">
-          <aero8:ButtonChrome Style="{StaticResource {x:Type aero8:ButtonChrome}}"
+          <aero8:ButtonChrome x:Name="ButtonChrome"
+                              Style="{StaticResource {x:Type aero8:ButtonChrome}}"
                               Focusable="False"
                               Background="{TemplateBinding Background}"
                               BorderBrush="{TemplateBinding BorderBrush}"
@@ -377,6 +378,11 @@
                               ContentStringFormat="{TemplateBinding ContentStringFormat}"
                               ContentTemplate="{TemplateBinding ContentTemplate}"
                               ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"/>
+          <ControlTemplate.Triggers>
+            <Trigger Property="ToggleButton.IsChecked" Value="True">
+              <Setter TargetName="ButtonChrome" Property="RenderPressed" Value="True"/>
+            </Trigger>
+          </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
     </Setter>

diff --git a/Source/ThemePreviewer/Samples/ButtonSampleNative.Designer.cs b/Source/ThemePreviewer/Samples/ButtonSampleNative.Designer.cs
diff --git a/Source/ThemePreviewer/Samples/ButtonSampleWpf.xaml b/Source/ThemePreviewer/Samples/ButtonSampleWpf.xaml
@@ -12,6 +12,12 @@
       <Setter Property="Margin" Value="0"/>
       <Setter Property="Padding" Value="6,1"/>
     </Style>
+    <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
+      <Setter Property="MinWidth" Value="75"/>
+      <Setter Property="MinHeight" Value="23"/>
+      <Setter Property="Margin" Value="0"/>
+      <Setter Property="Padding" Value="6,1"/>
+    </Style>
   </UserControl.Resources>
   <Grid Margin="3">
     <StackPanel>
@@ -20,6 +26,7 @@
           <Button Content="Button" Margin="0,0,0,6" HorizontalAlignment="Left"/>
           <Button x:Name="defaulted" Content="Default" IsDefault="True" Margin="0,0,0,6" HorizontalAlignment="Left"/>
           <Button Content="Disabled" IsEnabled="False" Margin="0,0,0,6" HorizontalAlignment="Left"/>
+          <ToggleButton Content="Toggled" IsChecked="True" HorizontalAlignment="Left" Margin="0,0,0,6"/>
         </StackPanel>
         <StackPanel Margin="22,0,0,0">
           <Button x:Name="normalChrome" Margin="0,0,0,6" HorizontalAlignment="Left" IsHitTestVisible="False"/>