Skip to content

Create the slider theme for md3 guideline #3432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Keboo merged 1 commit into from
Jan 11, 2024
+1,077 −16
Merged

Create the slider theme for md3 guideline #3432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MaterialDesign3.Demo.Wpf/FieldsLineUp.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<StackPanel Orientation="Horizontal">
<StackPanel>
<StackPanel.Resources>
<Style TargetType="Slider" BasedOn="{StaticResource MaterialDesignSlider}">
<Style TargetType="Slider" BasedOn="{StaticResource MaterialDesign3.MaterialDesignSlider}">
<Setter Property="IsSnapToTickEnabled" Value="True" />
<Setter Property="Margin" Value="10,0" />
<Setter Property="VerticalAlignment" Value="Center" />
Expand Down Expand Up @@ -245,4 +245,4 @@
</Grid>
</StackPanel>
</GroupBox>
</UserControl>
</UserControl>
22 changes: 11 additions & 11 deletions MaterialDesign3.Demo.Wpf/Sliders.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<!-- 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 -->
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Slider.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesign3.Slider.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</UserControl.Resources>
Expand Down Expand Up @@ -136,7 +136,7 @@
<smtx:XamlDisplay Margin="0,24,0,0" UniqueKey="discrete_slider_h_1">
<Slider Maximum="{Binding DiscreteHorizontal.Maximum}"
Minimum="0"
Style="{StaticResource MaterialDesignDiscreteSlider}"
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
TickFrequency="{Binding DiscreteHorizontal.TickFrequency}"
TickPlacement="BottomRight"
Value="40" />
Expand All @@ -148,7 +148,7 @@
Minimum="0"
SelectionEnd="90"
SelectionStart="70"
Style="{StaticResource MaterialDesignDiscreteSlider}"
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
TickFrequency="{Binding DiscreteHorizontal.TickFrequency}"
TickPlacement="TopLeft"
Value="20" />
Expand All @@ -157,7 +157,7 @@
<smtx:XamlDisplay Margin="0,24,0,0" UniqueKey="discrete_slider_h_3">
<Slider Maximum="{Binding DiscreteHorizontal.Maximum}"
Minimum="0"
Style="{StaticResource MaterialDesignDiscreteSlider}"
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
TickFrequency="{Binding DiscreteHorizontal.TickFrequency}"
TickPlacement="Both"
Value="60" />
Expand All @@ -167,7 +167,7 @@
<Slider IsEnabled="False"
Maximum="{Binding DiscreteHorizontal.Maximum}"
Minimum="0"
Style="{StaticResource MaterialDesignDiscreteSlider}"
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
TickFrequency="{Binding DiscreteHorizontal.TickFrequency}"
TickPlacement="BottomRight"
Value="50" />
Expand Down Expand Up @@ -208,7 +208,7 @@
<Slider Maximum="{Binding DiscreteVertical.Maximum}"
Minimum="0"
Orientation="Vertical"
Style="{StaticResource MaterialDesignDiscreteSlider}"
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
TickPlacement="BottomRight"
Value="70000" />
Expand All @@ -221,7 +221,7 @@
Orientation="Vertical"
SelectionEnd="90000"
SelectionStart="60000"
Style="{StaticResource MaterialDesignDiscreteSlider}"
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
TickPlacement="TopLeft"
Value="30000" />
Expand All @@ -231,7 +231,7 @@
<Slider Maximum="{Binding DiscreteVertical.Maximum}"
Minimum="0"
Orientation="Vertical"
Style="{StaticResource MaterialDesignDiscreteSlider}"
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
TickPlacement="Both"
Value="90000" />
Expand All @@ -242,7 +242,7 @@
Maximum="{Binding DiscreteVertical.Maximum}"
Minimum="0"
Orientation="Vertical"
Style="{StaticResource MaterialDesignDiscreteSlider}"
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
TickPlacement="BottomRight"
Value="50000" />
Expand All @@ -253,7 +253,7 @@
Maximum="{Binding DiscreteVertical.Maximum}"
Minimum="0"
Orientation="Vertical"
Style="{StaticResource MaterialDesignDiscreteSlider}"
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
TickPlacement="BottomRight"
Value="70000" />
Expand All @@ -264,7 +264,7 @@
Maximum="{Binding DiscreteVertical.Maximum}"
Minimum="0"
Orientation="Vertical"
Style="{StaticResource MaterialDesignDiscreteSlider}"
Style="{StaticResource MaterialDesign3.MaterialDesignDiscreteSlider}"
TickFrequency="{Binding DiscreteVertical.TickFrequency}"
TickPlacement="BottomRight"
Value="70000" />
Expand Down
6 changes: 3 additions & 3 deletions MaterialDesignThemes.Wpf/Themes/MaterialDesign3.Defaults.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">

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

<!-- MaterialDesign2 -->
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Badged.xaml" />
Expand Down Expand Up @@ -37,7 +38,6 @@
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ScrollBar.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ScrollViewer.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Shadows.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Slider.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TabControl.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBox.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TimePicker.xaml" />
Expand Down Expand Up @@ -86,7 +86,7 @@
<Style TargetType="{x:Type RichTextBox}" BasedOn="{StaticResource MaterialDesignRichTextBox}" />
<Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MaterialDesignScrollBar}" />
<Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource MaterialDesignScrollViewer}" />
<Style TargetType="{x:Type Slider}" BasedOn="{StaticResource MaterialDesignSlider}" />
<Style TargetType="{x:Type Slider}" BasedOn="{StaticResource MaterialDesign3.MaterialDesignSlider}" />
<Style TargetType="{x:Type TabControl}" BasedOn="{StaticResource MaterialDesignTabControl}" />
<Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource MaterialDesignTabItem}" />
<Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource MaterialDesignTextBox}" />
Expand Down
Loading