From 6628f589c01be5b13d2c92f79dc140dc1bd68966 Mon Sep 17 00:00:00 2001
From: Yimeng Wu <me@kinnara.cn>
Date: Tue, 18 Feb 2020 01:46:40 +0800
Subject: [PATCH] Tweak ToggleSwitch

---
 ModernWpf.Controls/ToggleSwitch/ToggleSwitch.cs   | 13 +++++++++++++
 ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml |  8 ++++----
 Settings.XamlStyler                               |  1 +
 test/ModernWpfTestApp/CommonStylesPage.xaml.cs    |  2 +-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.cs b/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.cs
index d872a84a..ab371fb3 100644
--- a/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.cs
+++ b/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.cs
@@ -236,6 +236,19 @@ public bool IsPressed
 
         #endregion
 
+        #region CornerRadius
+
+        public static readonly DependencyProperty CornerRadiusProperty =
+            ControlHelper.CornerRadiusProperty.AddOwner(typeof(ToggleSwitch));
+
+        public CornerRadius CornerRadius
+        {
+            get => (CornerRadius)GetValue(CornerRadiusProperty);
+            set => SetValue(CornerRadiusProperty, value);
+        }
+
+        #endregion
+
         private ContentPresenter HeaderContentPresenter { get; set; }
 
         private FrameworkElement SwitchKnobBounds { get; set; }
diff --git a/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml b/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml
index 92b392a8..6f7f0752 100644
--- a/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml
+++ b/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml
@@ -29,10 +29,11 @@
             <Setter.Value>
                 <ControlTemplate TargetType="local:ToggleSwitch">
                     <Border
-                        SnapsToDevicePixels="True"
+                        Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
+                        CornerRadius="{TemplateBinding CornerRadius}"
+                        SnapsToDevicePixels="True">
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="ToggleStates">
@@ -172,8 +173,7 @@
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
 
-                        <Grid Background="{TemplateBinding Background}">
-
+                        <Grid>
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="Auto" />
                                 <RowDefinition Height="*" />
diff --git a/Settings.XamlStyler b/Settings.XamlStyler
index 916d4121..a0eff66f 100644
--- a/Settings.XamlStyler
+++ b/Settings.XamlStyler
@@ -12,6 +12,7 @@
 		RotateTransform,
 		TranslateTransform,
 		Trigger,
+        EventTrigger,
 		Condition,
 		Setter,
 		Style,
diff --git a/test/ModernWpfTestApp/CommonStylesPage.xaml.cs b/test/ModernWpfTestApp/CommonStylesPage.xaml.cs
index 82643307..fce1a7fe 100644
--- a/test/ModernWpfTestApp/CommonStylesPage.xaml.cs
+++ b/test/ModernWpfTestApp/CommonStylesPage.xaml.cs
@@ -131,7 +131,7 @@ private void ToggleSwitchDensityTest_Click(object sender, RoutedEventArgs e)
                 simpleVerify.IsEqual(contentPresenter.Margin.ToString(), expectedHeaderMargin, "HeaderContentPresenter.Margin");
             }
 
-            var grid = (Grid)root;
+            var grid = (Grid)VisualTreeHelper.GetChild(root, 0);
             if (grid != null)
             {
                 var rowDefinitions = grid.RowDefinitions;