Skip to content

Commit dba2cf5

Browse files
viveleltsiDan Bourquin
viveleltsi
and
Dan Bourquin
authored
Create slider for md3 (#3432)
Co-authored-by: Dan Bourquin <[email protected]>
1 parent 919d1df commit dba2cf5

File tree

4 files changed

+1077
-16
lines changed

4 files changed

+1077
-16
lines changed

‎MaterialDesign3.Demo.Wpf/FieldsLineUp.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<StackPanel Orientation="Horizontal">
1818
<StackPanel>
1919
<StackPanel.Resources>
20-
<Style TargetType="Slider" BasedOn="{StaticResource MaterialDesignSlider}">
20+
<Style TargetType="Slider" BasedOn="{StaticResource MaterialDesign3.MaterialDesignSlider}">
2121
<Setter Property="IsSnapToTickEnabled" Value="True" />
2222
<Setter Property="Margin" Value="10,0" />
2323
<Setter Property="VerticalAlignment" Value="Center" />
@@ -245,4 +245,4 @@
245245
</Grid>
246246
</StackPanel>
247247
</GroupBox>
248-
</UserControl>
248+
</UserControl>

‎MaterialDesign3.Demo.Wpf/Sliders.xaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<ResourceDictionary>
1616
<ResourceDictionary.MergedDictionaries>
1717
<!-- note you only need bring in these extra resource dictionaries when using non-default styles, so only bring them into your controls where the default style is not what you want -->
18-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Slider.xaml" />
18+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Slider.xaml" />
1919
</ResourceDictionary.MergedDictionaries>
2020
</ResourceDictionary>
2121
</UserControl.Resources>
@@ -136,7 +136,7 @@
136136
<smtx:XamlDisplay Margin="0,24,0,0" UniqueKey="discrete_slider_h_1">
137137
<Slider Maximum="{Binding DiscreteHorizontal.Maximum}"
138138
Minimum="0"
139-
Style="{StaticResource MaterialDesignDiscreteSlider}"
139+
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
140140
TickFrequency="{Binding DiscreteHorizontal.TickFrequency}"
141141
TickPlacement="BottomRight"
142142
Value="40" />
@@ -148,7 +148,7 @@
148148
Minimum="0"
149149
SelectionEnd="90"
150150
SelectionStart="70"
151-
Style="{StaticResource MaterialDesignDiscreteSlider}"
151+
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
152152
TickFrequency="{Binding DiscreteHorizontal.TickFrequency}"
153153
TickPlacement="TopLeft"
154154
Value="20" />
@@ -157,7 +157,7 @@
157157
<smtx:XamlDisplay Margin="0,24,0,0" UniqueKey="discrete_slider_h_3">
158158
<Slider Maximum="{Binding DiscreteHorizontal.Maximum}"
159159
Minimum="0"
160-
Style="{StaticResource MaterialDesignDiscreteSlider}"
160+
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
161161
TickFrequency="{Binding DiscreteHorizontal.TickFrequency}"
162162
TickPlacement="Both"
163163
Value="60" />
@@ -167,7 +167,7 @@
167167
<Slider IsEnabled="False"
168168
Maximum="{Binding DiscreteHorizontal.Maximum}"
169169
Minimum="0"
170-
Style="{StaticResource MaterialDesignDiscreteSlider}"
170+
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
171171
TickFrequency="{Binding DiscreteHorizontal.TickFrequency}"
172172
TickPlacement="BottomRight"
173173
Value="50" />
@@ -208,7 +208,7 @@
208208
<Slider Maximum="{Binding DiscreteVertical.Maximum}"
209209
Minimum="0"
210210
Orientation="Vertical"
211-
Style="{StaticResource MaterialDesignDiscreteSlider}"
211+
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
212212
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
213213
TickPlacement="BottomRight"
214214
Value="70000" />
@@ -221,7 +221,7 @@
221221
Orientation="Vertical"
222222
SelectionEnd="90000"
223223
SelectionStart="60000"
224-
Style="{StaticResource MaterialDesignDiscreteSlider}"
224+
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
225225
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
226226
TickPlacement="TopLeft"
227227
Value="30000" />
@@ -231,7 +231,7 @@
231231
<Slider Maximum="{Binding DiscreteVertical.Maximum}"
232232
Minimum="0"
233233
Orientation="Vertical"
234-
Style="{StaticResource MaterialDesignDiscreteSlider}"
234+
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
235235
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
236236
TickPlacement="Both"
237237
Value="90000" />
@@ -242,7 +242,7 @@
242242
Maximum="{Binding DiscreteVertical.Maximum}"
243243
Minimum="0"
244244
Orientation="Vertical"
245-
Style="{StaticResource MaterialDesignDiscreteSlider}"
245+
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
246246
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
247247
TickPlacement="BottomRight"
248248
Value="50000" />
@@ -253,7 +253,7 @@
253253
Maximum="{Binding DiscreteVertical.Maximum}"
254254
Minimum="0"
255255
Orientation="Vertical"
256-
Style="{StaticResource MaterialDesignDiscreteSlider}"
256+
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
257257
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
258258
TickPlacement="BottomRight"
259259
Value="70000" />
@@ -264,7 +264,7 @@
264264
Maximum="{Binding DiscreteVertical.Maximum}"
265265
Minimum="0"
266266
Orientation="Vertical"
267-
Style="{StaticResource MaterialDesignDiscreteSlider}"
267+
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
268268
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
269269
TickPlacement="BottomRight"
270270
Value="70000" />

‎MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
33

44
<!-- use this resource dictionary to set up the most common themes for standard controls -->
@@ -10,6 +10,7 @@
1010
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.NavigationRail.xaml" />
1111
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.NavigationBar.xaml" />
1212
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.NavigationDrawer.xaml" />
13+
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Slider.xaml" />
1314

1415
<!-- MaterialDesign2 -->
1516
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Badged.xaml" />
@@ -37,7 +38,6 @@
3738
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ScrollBar.xaml" />
3839
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ScrollViewer.xaml" />
3940
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Shadows.xaml" />
40-
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Slider.xaml" />
4141
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TabControl.xaml" />
4242
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBox.xaml" />
4343
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TimePicker.xaml" />
@@ -86,7 +86,7 @@
8686
<Style TargetType="{x:Type RichTextBox}" BasedOn="{StaticResource MaterialDesignRichTextBox}" />
8787
<Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MaterialDesignScrollBar}" />
8888
<Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource MaterialDesignScrollViewer}" />
89-
<Style TargetType="{x:Type Slider}" BasedOn="{StaticResource MaterialDesignSlider}" />
89+
<Style TargetType="{x:Type Slider}" BasedOn="{StaticResource MaterialDesign3.MaterialDesignSlider}" />
9090
<Style TargetType="{x:Type TabControl}" BasedOn="{StaticResource MaterialDesignTabControl}" />
9191
<Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource MaterialDesignTabItem}" />
9292
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBox}" />

0 commit comments

Comments
 (0)