fix(slider): remove fixed space around slider

unoplatform · Dec 5, 2023 · bafc8c6 · bafc8c6
1 parent ba40266
commit bafc8c6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml b/src/library/Uno.Material/Styles/Controls/v2/Slider.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 					xmlns:not_win="http://uno.ui/not_win"
@@ -215,8 +215,7 @@
 							  Control.IsTemplateFocusTarget="True">
 
 							<!-- HorizontalTemplate -->
-							<Grid x:Name="HorizontalTemplate"
-								  MinHeight="32">
+							<Grid x:Name="HorizontalTemplate">
 
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="Auto" />
@@ -225,9 +224,9 @@
 								</Grid.ColumnDefinitions>
 
 								<Grid.RowDefinitions>
-									<RowDefinition Height="15" />
 									<RowDefinition Height="Auto" />
-									<RowDefinition Height="15" />
+									<RowDefinition Height="Auto" />
+									<RowDefinition Height="Auto" />
 								</Grid.RowDefinitions>
 
 								<!-- HorizontalTrackRect -->
@@ -288,7 +287,6 @@
 
 							<!-- VerticalTemplate -->
 							<Grid x:Name="VerticalTemplate"
-								  MinWidth="32"
 								  Visibility="Collapsed">
 
 								<Grid.RowDefinitions>
@@ -298,9 +296,9 @@
 								</Grid.RowDefinitions>
 
 								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="15" />
 									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition Width="15" />
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition Width="Auto" />
 								</Grid.ColumnDefinitions>
 
 								<!-- VerticalTrackRect -->

diff --git a/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/SliderSamplePage.xaml b/src/samples/UWP/Uno.Themes.Samples.Shared/Content/Controls/SliderSamplePage.xaml
@@ -136,8 +136,8 @@
 
 						<!--  Slider Vertical  -->
 						<smtx:XamlDisplay UniqueKey="M3_Material_SliderSamplePage_Vertical">
-							<StackPanel Orientation="Horizontal">
-
+							<StackPanel Orientation="Horizontal"
+										Spacing="5">
 								<Slider Height="200"
 										Maximum="100"
 										Minimum="0"
@@ -157,8 +157,7 @@
 
 						<!--  Slider Horizontal  -->
 						<smtx:XamlDisplay UniqueKey="M3_Material_SliderSamplePage_Horizontal">
-							<StackPanel>
-
+							<StackPanel Spacing="5">
 								<Slider Width="200"
 										Maximum="100"
 										Minimum="0"