Port microsoft/microsoft-ui-xaml#4569 (#618)

Kinnara · Nov 19, 2023 · 292a866 · 292a866
1 parent 5f3de40
commit 292a866
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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)
             {