Merge pull request #706 from unoplatform/dev/xygu/20211216/material-t…

…oggleswitch-width fix: material toggleswitch min-width
unoplatform · Dec 17, 2021 · 0d85235 · 0d85235
2 parents 2704a09 + 2ecc84e
commit 0d85235
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/library/Uno.Material/Styles/Controls/ToggleSwitch.Mobile.xaml b/src/library/Uno.Material/Styles/Controls/ToggleSwitch.Mobile.xaml
@@ -28,6 +28,10 @@
 		<Setter Property="Foreground"
 				Value="{StaticResource MaterialToggleSwitchOnButtonBrush}" />
 
+		<!-- microsoft/microsoft-ui-xaml#6157: reset min-width inherited from base style -->
+		<Setter Property="MinWidth"
+				Value="NaN" />
+
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="ToggleSwitch">
@@ -70,8 +74,10 @@
 				Value="Stretch" />
 		<Setter Property="MinHeight"
 				Value="25" />
+
+		<!-- microsoft/microsoft-ui-xaml#6157: reset min-width inherited from base style -->
 		<Setter Property="MinWidth"
-				Value="70" />
+				Value="NaN" />
 
 		<Setter Property="Template">
 			<Setter.Value>

diff --git a/src/library/Uno.Material/Styles/Controls/ToggleSwitch.xaml b/src/library/Uno.Material/Styles/Controls/ToggleSwitch.xaml
@@ -26,6 +26,10 @@
 		<Setter Property="Background"
 				Value="{StaticResource MaterialToggleSwitchOnBackgroundBrush}" />
 
+		<!-- microsoft/microsoft-ui-xaml#6157: reset min-width inherited from base style -->
+		<Setter Property="MinWidth"
+				Value="NaN" />
+
 		<Setter Property="HorizontalAlignment"
 				Value="Left" />
 		<Setter Property="VerticalAlignment"