Skip to content

Commit 8e2e16f

Browse files
committed
Repeat buttons can use standard raised buttons. fixes #244
1 parent 99dff8a commit 8e2e16f

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

MainDemo.Wpf/Buttons.xaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,17 @@
167167
ToolTip="Resource name: MaterialDesignRaisedAccentButton">
168168
ACCENT
169169
</Button>
170-
171170
</StackPanel>
172171
<StackPanel Grid.Row="3" Margin="0 24 0 0" Orientation="Horizontal">
173172
<Button Style="{StaticResource MaterialDesignRaisedAccentButton}"
174173
Margin="0 0 8 0"
175174
Width="150"
176175
ToolTip="Resource name: MaterialDesignRaisedAccentButton"
177176
materialDesign:RippleAssist.Feedback="#DD000000">CUSTOM RIPPLE</Button>
177+
<RepeatButton Margin="0 0 8 0" Width="100"
178+
ToolTip="Resource name: MaterialDesignRaisedButton">
179+
REPEAT
180+
</RepeatButton>
178181
<Button Style="{StaticResource MaterialDesignFlatButton}" Click="ButtonBase_OnClick" ToolTip="MaterialDesignFlatButton" Margin="200 0 0 0">ACCEPT</Button>
179182
<Button Style="{StaticResource MaterialDesignFlatButton}" ToolTip="MaterialDesignFlatButton">CANCEL</Button>
180183
</StackPanel>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<SolidColorBrush x:Key="AttentionToActionBrush" Color="{StaticResource MaterialDesignShadow}" Opacity=".23" po:Freeze="True" />
2222

23-
<Style x:Key="MaterialDesignRaisedButton" TargetType="{x:Type Button}">
23+
<Style x:Key="MaterialDesignRaisedButton" TargetType="{x:Type ButtonBase}">
2424
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
2525
<Setter Property="Background" Value="{DynamicResource PrimaryHueMidBrush}"/>
2626
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueMidBrush}"/>
@@ -37,7 +37,7 @@
3737
<Setter Property="Height" Value="32" />
3838
<Setter Property="Template">
3939
<Setter.Value>
40-
<ControlTemplate TargetType="{x:Type Button}">
40+
<ControlTemplate TargetType="{x:Type ButtonBase}">
4141
<Grid>
4242
<AdornerDecorator>
4343
<AdornerDecorator.CacheMode>
@@ -69,19 +69,19 @@
6969
</Setter>
7070
</Style>
7171

72-
<Style x:Key="MaterialDesignRaisedLightButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
72+
<Style x:Key="MaterialDesignRaisedLightButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
7373
<Setter Property="Background" Value="{DynamicResource PrimaryHueLightBrush}"/>
7474
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueLightBrush}"/>
7575
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueLightForegroundBrush}"/>
7676
</Style>
7777

78-
<Style x:Key="MaterialDesignRaisedDarkButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
78+
<Style x:Key="MaterialDesignRaisedDarkButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
7979
<Setter Property="Background" Value="{DynamicResource PrimaryHueDarkBrush}"/>
8080
<Setter Property="BorderBrush" Value="{DynamicResource PrimaryHueDarkBrush}"/>
8181
<Setter Property="Foreground" Value="{DynamicResource PrimaryHueDarkForegroundBrush}"/>
8282
</Style>
8383

84-
<Style x:Key="MaterialDesignRaisedAccentButton" TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
84+
<Style x:Key="MaterialDesignRaisedAccentButton" TargetType="{x:Type ButtonBase}" BasedOn="{StaticResource MaterialDesignRaisedButton}">
8585
<Setter Property="Background" Value="{DynamicResource SecondaryAccentBrush}"/>
8686
<Setter Property="BorderBrush" Value="{DynamicResource SecondaryAccentBrush}"/>
8787
<Setter Property="Foreground" Value="{DynamicResource SecondaryAccentForegroundBrush}"/>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Defaults.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
<Style TargetType="{x:Type PasswordBox}" BasedOn="{StaticResource MaterialDesignPasswordBox}" />
6060
<Style TargetType="{x:Type ProgressBar}" BasedOn="{StaticResource MaterialDesignLinearProgressBar}" />
6161
<Style TargetType="{x:Type RadioButton}" BasedOn="{StaticResource MaterialDesignRadioButton}" />
62+
<Style TargetType="{x:Type RepeatButton}" BasedOn="{StaticResource MaterialDesignRaisedButton}" />
6263
<Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource MaterialDesignScrollBar}" />
6364
<Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource MaterialDesignScrollViewer}" />
6465
<Style TargetType="{x:Type Slider}" BasedOn="{StaticResource MaterialDesignSlider}" />

0 commit comments

Comments
 (0)