(GH-3753) Use ToggleSwitchContentSpaceMargin for space between switch…

… and content
MahApps · Feb 29, 2020 · a7bc047 · a7bc047
1 parent d0d9f96
commit a7bc047
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 99 deletions.
diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml
@@ -282,8 +282,15 @@
 
             <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}" Header="Header" />
             <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}" IsEnabled="False" />
-            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}" OnContent="Enabled" OffContent="Disabled" IsOn="True" />
-            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}" OnContent="Enabled" OffContent="Disabled" IsOn="True" IsEnabled="False" />
+            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
+                                   IsOn="True"
+                                   OffContent="Disabled"
+                                   OnContent="Enabled" />
+            <Controls:ToggleSwitch Margin="{StaticResource ControlMargin}"
+                                   IsEnabled="False"
+                                   IsOn="True"
+                                   OffContent="Disabled"
+                                   OnContent="Enabled" />
         </StackPanel>
 
         <StackPanel Grid.Row="1"

diff --git a/src/MahApps.Metro/Styles/Controls.xaml b/src/MahApps.Metro/Styles/Controls.xaml
@@ -43,6 +43,7 @@
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/HamburgerMenu.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/RangeSlider.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/MetroProgressBar.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Themes/ToggleSwitch.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="MahApps.Styles.ContentControl.FloatingMessageContainer" TargetType="{x:Type ContentControl}">

diff --git a/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml b/src/MahApps.Metro/Styles/Themes/Theme.Template.xaml
@@ -477,7 +477,7 @@
     <markup:StaticResource x:Key="MahApps.Brushes.RadioButton.CheckGlyphStrokePressed" ResourceKey="MahApps.Brushes.SystemControlTransparent" />
     <markup:StaticResource x:Key="MahApps.Brushes.RadioButton.CheckGlyphStrokeDisabled" ResourceKey="MahApps.Brushes.SystemControlTransparent" />
 
-    <!-- Resources for MahApps.Styles.ToggleSwitchButton.Win10 and MahApps.Styles.ToggleSwitch.Win10 -->
+    <!--  Resources for MahApps.Styles.ToggleSwitch  -->
     <markup:StaticResource x:Key="MahApps.Brushes.ToggleSwitch.ContentForeground" ResourceKey="MahApps.Brushes.SystemControlForegroundBaseHigh" />
     <markup:StaticResource x:Key="MahApps.Brushes.ToggleSwitch.ContentForegroundDisabled" ResourceKey="MahApps.Brushes.SystemControlDisabledBaseMediumLow" />
     <markup:StaticResource x:Key="MahApps.Brushes.ToggleSwitch.HeaderForeground" ResourceKey="MahApps.Brushes.SystemControlForegroundBaseHigh" />