WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 8923df9

Browse files
fix(MediaTransportControls): MPE sliders vertical alignment (#1538) (#1539)
Co-authored-by: Andres Pineda <[email protected]>
1 parent b875853 commit 8923df9

File tree

1 file changed

+16
-5
lines changed

1 file changed

+16
-5
lines changed

src/library/Uno.Material/Styles/Controls/v2/Slider.xaml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<x:Double x:Key="SliderTrackThickness">4</x:Double>
2828
<x:Double x:Key="SliderFillThickness">6</x:Double>
2929

30+
<x:Double x:Key="SliderPreContentMargin">14</x:Double>
31+
<x:Double x:Key="SliderPostContentMargin">14</x:Double>
32+
<x:Double x:Key="SliderHorizontalHeight">32</x:Double>
33+
<x:Double x:Key="SliderVerticalWidth">32</x:Double>
34+
3035
<!-- Resources for the Slider Ticks, For future uses. -->
3136
<StaticResource x:Key="SliderTickBarFill" ResourceKey="OnSurfaceVariantBrush" />
3237
<StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
@@ -75,6 +80,11 @@
7580
<x:Double x:Key="SliderTrackThickness">4</x:Double>
7681
<x:Double x:Key="SliderFillThickness">6</x:Double>
7782

83+
<x:Double x:Key="SliderPreContentMargin">14</x:Double>
84+
<x:Double x:Key="SliderPostContentMargin">14</x:Double>
85+
<x:Double x:Key="SliderHorizontalHeight">32</x:Double>
86+
<x:Double x:Key="SliderVerticalWidth">32</x:Double>
87+
7888
<!-- Resources for the Slider Ticks, For future uses. -->
7989
<StaticResource x:Key="SliderTickBarFill" ResourceKey="OnSurfaceVariantBrush" />
8090
<StaticResource x:Key="SliderTickBarFillDisabled" ResourceKey="SystemControlDisabledChromeDisabledHighBrush" />
@@ -215,7 +225,7 @@
215225
Control.IsTemplateFocusTarget="True">
216226

217227
<!-- HorizontalTemplate -->
218-
<Grid x:Name="HorizontalTemplate">
228+
<Grid x:Name="HorizontalTemplate" MinHeight="{ThemeResource SliderHorizontalHeight}">
219229

220230
<Grid.ColumnDefinitions>
221231
<ColumnDefinition Width="Auto" />
@@ -224,9 +234,9 @@
224234
</Grid.ColumnDefinitions>
225235

226236
<Grid.RowDefinitions>
237+
<RowDefinition Height="{ThemeResource SliderPreContentMargin}" />
227238
<RowDefinition Height="Auto" />
228-
<RowDefinition Height="Auto" />
229-
<RowDefinition Height="Auto" />
239+
<RowDefinition Height="{ThemeResource SliderPostContentMargin}" />
230240
</Grid.RowDefinitions>
231241

232242
<!-- HorizontalTrackRect -->
@@ -287,6 +297,7 @@
287297

288298
<!-- VerticalTemplate -->
289299
<Grid x:Name="VerticalTemplate"
300+
MinWidth="{ThemeResource SliderVerticalWidth}"
290301
Visibility="Collapsed">
291302

292303
<Grid.RowDefinitions>
@@ -296,9 +307,9 @@
296307
</Grid.RowDefinitions>
297308

298309
<Grid.ColumnDefinitions>
310+
<ColumnDefinition Width="{ThemeResource SliderPreContentMargin}" />
299311
<ColumnDefinition Width="Auto" />
300-
<ColumnDefinition Width="Auto" />
301-
<ColumnDefinition Width="Auto" />
312+
<ColumnDefinition Width="{ThemeResource SliderPostContentMargin}" />
302313
</Grid.ColumnDefinitions>
303314

304315
<!-- VerticalTrackRect -->

0 commit comments

Comments
 (0)