complete switch toggle on content support

Author: ButchersBoy

MainDemo.Wpf/Buttons.xaml

@@ -264,12 +264,14 @@
                 <ToggleButton Style="{StaticResource MaterialDesignSwitchAccentToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0"
                           ToolTip="MaterialDesignSwitchAccentToggleButton" IsChecked="True" />
                 <ToggleButton Style="{StaticResource MaterialDesignSwitchToggleButton}" VerticalAlignment="Center" Margin="8 0 0 0" 
-                          ToolTip="MaterialDesignSwitchToggleButton w/ Content" IsChecked="True">
-                    <ToggleButton.Content>
-                        <materialDesign:PackIcon Kind="Play"/>
-                    </ToggleButton.Content>
+                          ToolTip="MaterialDesignSwitchToggleButton with Content and ToggleButtonAssist.OnContent">
+                    <materialDesign:PackIcon Kind="Pin" RenderTransformOrigin=".5,.5">
+                        <materialDesign:PackIcon.RenderTransform>
+                            <RotateTransform Angle="45" />
+                        </materialDesign:PackIcon.RenderTransform>
+                    </materialDesign:PackIcon>
                     <materialDesign:ToggleButtonAssist.OnContent>
-                        <materialDesign:PackIcon Kind="Headphones"/>
+                        <materialDesign:PackIcon Kind="Pin"/>
                     </materialDesign:ToggleButtonAssist.OnContent>
                 </ToggleButton>
             </StackPanel>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToggleButton.xaml

@@ -263,7 +263,7 @@
         <Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidForegroundBrush}"/>
         <Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}"/>
 		<Setter Property="BorderThickness" Value="1"/>
-		<Setter Property="Padding" Value="1"/>
+		<Setter Property="Padding" Value="0 1 0 0"/>
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ToggleButton}">
@@ -357,8 +357,10 @@
                                     </Ellipse>
                                 </AdornerDecorator>
                                 <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" 
-                                              FlowDirection="LeftToRight"/>
+                                                  Margin="{TemplateBinding Padding}"
+                                                  x:Name="ContentPresenter"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" 
+                                                  FlowDirection="LeftToRight"/>
                                 <Grid.RenderTransform>
                                     <TranslateTransform X="0" Y="0"/>
                                 </Grid.RenderTransform>
@@ -371,6 +373,14 @@
 							<Setter TargetName="Track" Property="Fill" Value="{DynamicResource PrimaryHueLightBrush}" />
                             <Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidForegroundBrush}"/>
                         </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="True" />
+                                <Condition Property="wpf:ToggleButtonAssist.HasOnContent" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="ContentPresenter" Property="Content" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ToggleButtonAssist.OnContent)}" />
+                            <Setter TargetName="ContentPresenter" Property="ContentTemplate" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ToggleButtonAssist.OnContentTemplate)}" />
+                        </MultiTrigger>
                         <Trigger Property="IsChecked" Value="False">
                             <Setter Property="Foreground" Value="{DynamicResource PrimaryHueMidBrush}"/> <!-- Need to set Foreground to Background here instead of hardcoded PrimaryHueMidBrush -->
                         </Trigger>

MaterialDesignThemes.Wpf/ToggleButtonAssist.cs

@@ -1,15 +1,43 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Controls.Primitives;
 
 namespace MaterialDesignThemes.Wpf
 {
     public static class ToggleButtonAssist
     {
+        private static readonly DependencyPropertyKey HasOnContentPropertyKey =
+            DependencyProperty.RegisterAttachedReadOnly(
+                "HasOnContent", typeof(bool), typeof(ToggleButtonAssist),
+                new PropertyMetadata(false));
+
+        public static readonly DependencyProperty HasOnContentProperty = HasOnContentPropertyKey.DependencyProperty;
+
+        private static void SetHasOnContent(DependencyObject element, object value)
+        {
+            element.SetValue(HasOnContentPropertyKey, value);
+        }
+
+        /// <summary>
+        /// Framework use only.
+        /// </summary>
+        /// <param name="element"></param>
+        /// <returns></returns>
+        public static bool GetHasOnContent(DependencyObject element)
+        {
+            return (bool)element.GetValue(HasOnContentProperty);
+        }
+
         /// <summary>
         /// Allows on (IsChecked) content to be provided on supporting <see cref="ToggleButton"/> styles.
         /// </summary>
         public static readonly DependencyProperty OnContentProperty = DependencyProperty.RegisterAttached(
-            "OnContent", typeof (object), typeof (ToggleButtonAssist), new PropertyMetadata(default(object)));
+            "OnContent", typeof (object), typeof (ToggleButtonAssist), new PropertyMetadata(default(object), OnContentPropertyChangedCallback));
+
+        private static void OnContentPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+        {
+            SetHasOnContent(dependencyObject, dependencyPropertyChangedEventArgs.NewValue != null);
+        }
 
         /// <summary>
         /// Allows on (IsChecked) content to be provided on supporting <see cref="ToggleButton"/> styles.