Fix #197: Problem with MinWidth property of the ToggleSwitch

Kinnara · Nov 12, 2020 · 0407148 · 0407148
1 parent fce6cac
commit 0407148
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml b/ModernWpf.Controls/ToggleSwitch/ToggleSwitch.xaml
@@ -6,11 +6,6 @@
     xmlns:local="clr-namespace:ModernWpf.Controls"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
-    <GridLength x:Key="ToggleSwitchPreContentMargin">6</GridLength>
-    <GridLength x:Key="ToggleSwitchPostContentMargin">6</GridLength>
-
-    <sys:Double x:Key="ToggleSwitchThemeMinWidth">154</sys:Double>
-
     <sys:TimeSpan x:Key="RepositionDelay">0:0:0.033</sys:TimeSpan>
     <KeyTime x:Key="RepositionDuration">0:0:0.367</KeyTime>
     <KeySpline x:Key="RepositionKeySpline">0.1,0.9 0.2,1.0</KeySpline>
@@ -196,14 +191,14 @@
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             <Grid
                                 Grid.Row="1"
-                                MinWidth="{StaticResource ToggleSwitchThemeMinWidth}"
+                                MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Top">
 
                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="{StaticResource ToggleSwitchPreContentMargin}" />
+                                    <RowDefinition ui:RowDefinitionHelper.PixelHeight="{DynamicResource ToggleSwitchPreContentMargin}" />
                                     <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="{StaticResource ToggleSwitchPostContentMargin}" />
+                                    <RowDefinition ui:RowDefinitionHelper.PixelHeight="{DynamicResource ToggleSwitchPostContentMargin}" />
                                 </Grid.RowDefinitions>
 
                                 <Grid.ColumnDefinitions>

diff --git a/ModernWpf/ControlsResources.xaml b/ModernWpf/ControlsResources.xaml
@@ -66,6 +66,9 @@
     <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>
+    <sys:Double x:Key="ToggleSwitchThemeMinWidth">154</sys:Double>
 
     <ControlTemplate x:Key="TextControlValidationErrorTemplate">
         <Grid SnapsToDevicePixels="True">