From 292a8666c1b273ea18a46ce0ff0f2efcb01a1c63 Mon Sep 17 00:00:00 2001
From: Yimeng Wu <me@kinnara.cn>
Date: Sun, 19 Nov 2023 23:27:53 +0000
Subject: [PATCH] Port microsoft/microsoft-ui-xaml#4569 (#618)

---
 ModernWpf/ControlsResources.xaml               | 6 +++---
 test/ModernWpfTestApp/CommonStylesPage.xaml.cs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ModernWpf/ControlsResources.xaml b/ModernWpf/ControlsResources.xaml
index c3cb4cd3..32048e82 100644
--- a/ModernWpf/ControlsResources.xaml
+++ b/ModernWpf/ControlsResources.xaml
@@ -65,9 +65,9 @@
     <Thickness x:Key="NumberBoxIconMargin">10,0,0,0</Thickness>
     <Thickness x:Key="RadioButtonsTopHeaderMargin">0,0,0,4</Thickness>
     <Thickness x:Key="TextControlThemePadding">10,5,6,6</Thickness>
-    <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,0</Thickness>
-    <sys:Double x:Key="ToggleSwitchPreContentMargin">6</sys:Double>
-    <sys:Double x:Key="ToggleSwitchPostContentMargin">6</sys:Double>
+    <Thickness x:Key="ToggleSwitchTopHeaderMargin">0,0,0,4</Thickness>
+    <sys:Double x:Key="ToggleSwitchPreContentMargin">10</sys:Double>
+    <sys:Double x:Key="ToggleSwitchPostContentMargin">10</sys:Double>
     <sys:Double x:Key="ToggleSwitchThemeMinWidth">154</sys:Double>
 
     <sys:Double x:Key="MenuFlyoutSeparatorHeight">1</sys:Double>
diff --git a/test/ModernWpfTestApp/CommonStylesPage.xaml.cs b/test/ModernWpfTestApp/CommonStylesPage.xaml.cs
index abfa5cde..dcc17750 100644
--- a/test/ModernWpfTestApp/CommonStylesPage.xaml.cs
+++ b/test/ModernWpfTestApp/CommonStylesPage.xaml.cs
@@ -124,9 +124,9 @@ private void ToggleSwitchDensityTest_Click(object sender, RoutedEventArgs e)
             var contentPresenter = (ContentPresenter)root.FindName("HeaderContentPresenter");
             simpleVerify.IsTrue(contentPresenter != null, "HeaderContentPresenter can't be found");
 
-            string expectedHeaderMargin = "0,0,0,0";
-            string expectToggleSwitchPreContentMargin = "6";
-            string expectToggleSwitchPostContentMargin = "6";
+            string expectedHeaderMargin = "0,0,0,4";
+            string expectToggleSwitchPreContentMargin = "10";
+            string expectToggleSwitchPostContentMargin = "10";
 
             if (contentPresenter != null)
             {