Tweak ToggleSwitch

Kinnara · Feb 17, 2020 · 6628f58 · 6628f58
1 parent 5759021
commit 6628f58
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;