Skip to content

Commit bc62565

Browse files
ButchersBoyButchersBoy
committed
Merge branch 'buttonround' of https://github.com/xaviergonz/MaterialDesignInXamlToolkit into xaviergonz-buttonround
2 parents df6250d + a86be07 commit bc62565

File tree

1 file changed

+17
-89
lines changed

1 file changed

+17
-89
lines changed

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Button.xaml‎

Lines changed: 17 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -37,71 +37,35 @@
3737
<Setter Property="Template">
3838
<Setter.Value>
3939
<ControlTemplate TargetType="{x:Type Button}">
40-
<ControlTemplate.Resources>
41-
<Storyboard x:Key="OnClick">
42-
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ClickBorder" Storyboard.TargetProperty="Opacity">
43-
<DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
44-
<EasingDoubleKeyFrame KeyTime="0:0:0.05" Value=".12">
45-
<EasingDoubleKeyFrame.EasingFunction>
46-
<CircleEase EasingMode="EaseOut" />
47-
</EasingDoubleKeyFrame.EasingFunction>
48-
</EasingDoubleKeyFrame>
49-
<DiscreteDoubleKeyFrame KeyTime="0:0:0.6" Value=".12" />
50-
<EasingDoubleKeyFrame KeyTime="0:0:0.8" Value="0">
51-
<EasingDoubleKeyFrame.EasingFunction>
52-
<SineEase EasingMode="EaseOut" />
53-
</EasingDoubleKeyFrame.EasingFunction>
54-
</EasingDoubleKeyFrame>
55-
</DoubleAnimationUsingKeyFrames>
56-
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="ClickBorder">
57-
<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1"/>
58-
<EasingDoubleKeyFrame KeyTime="0:0:0.8" Value="1"/>
59-
<EasingDoubleKeyFrame KeyTime="0:0:0.81" Value="0"/>
60-
</DoubleAnimationUsingKeyFrames>
61-
</Storyboard>
62-
</ControlTemplate.Resources>
6340
<Grid>
6441
<AdornerDecorator>
6542
<AdornerDecorator.CacheMode>
6643
<BitmapCache EnableClearType="True" SnapsToDevicePixels="True"/>
6744
</AdornerDecorator.CacheMode>
68-
<Border Background="{TemplateBinding Background}"
69-
x:Name="ShadowBorder"
45+
<Border Background="{TemplateBinding Background}" CornerRadius="2"
46+
BorderThickness="{TemplateBinding BorderThickness}"
47+
BorderBrush="{TemplateBinding BorderBrush}"
48+
x:Name="border"
7049
Effect="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(wpf:ShadowAssist.ShadowDepth), Converter={x:Static converters:ShadowConverter.Instance}}">
7150
</Border>
7251
</AdornerDecorator>
73-
<Border Background="{TemplateBinding Background}" x:Name="border" CornerRadius="2" />
74-
<Border Background="White" CornerRadius="2" x:Name="ClickBorder" Opacity="0" RenderTransformOrigin="0.5,0.5" >
75-
<Border.RenderTransform>
76-
<TransformGroup>
77-
<ScaleTransform ScaleX="0"/>
78-
<SkewTransform/>
79-
<RotateTransform/>
80-
<TranslateTransform/>
81-
</TransformGroup>
82-
</Border.RenderTransform>
83-
</Border>
8452
<wpf:Ripple Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False"
85-
Feedback="White"
86-
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
87-
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
88-
Padding="{TemplateBinding Padding}"
89-
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
53+
Feedback="White"
54+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
55+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
56+
Padding="{TemplateBinding Padding}"
57+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
9058
</Grid>
9159
<ControlTemplate.Triggers>
9260
<Trigger Property="IsDefaulted" Value="true">
93-
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
61+
<!--<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>-->
9462
</Trigger>
9563
<Trigger Property="IsMouseOver" Value="true">
96-
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource AttentionToActionBrush}" />
97-
<Setter TargetName="ShadowBorder" Property="wpf:ShadowAssist.Darken" Value="True" />
64+
<Setter TargetName="border" Property="wpf:ShadowAssist.Darken" Value="True" />
9865
</Trigger>
9966
<Trigger Property="IsEnabled" Value="false">
10067
<Setter Property="Opacity" Value="0.23"/>
10168
</Trigger>
102-
<EventTrigger RoutedEvent="Click">
103-
<!--BeginStoryboard Storyboard="{StaticResource OnClick}"/-->
104-
</EventTrigger>
10569
</ControlTemplate.Triggers>
10670
</ControlTemplate>
10771
</Setter.Value>
@@ -141,63 +105,27 @@
141105
<Setter Property="Template">
142106
<Setter.Value>
143107
<ControlTemplate TargetType="{x:Type Button}">
144-
<ControlTemplate.Resources>
145-
<Storyboard x:Key="OnClick">
146-
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="ClickBorder" Storyboard.TargetProperty="Opacity">
147-
<DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
148-
<EasingDoubleKeyFrame KeyTime="0:0:0.05" Value="1">
149-
<EasingDoubleKeyFrame.EasingFunction>
150-
<CircleEase EasingMode="EaseOut" />
151-
</EasingDoubleKeyFrame.EasingFunction>
152-
</EasingDoubleKeyFrame>
153-
<DiscreteDoubleKeyFrame KeyTime="0:0:0.6" Value="1" />
154-
<EasingDoubleKeyFrame KeyTime="0:0:0.8" Value="0">
155-
<EasingDoubleKeyFrame.EasingFunction>
156-
<SineEase EasingMode="EaseOut" />
157-
</EasingDoubleKeyFrame.EasingFunction>
158-
</EasingDoubleKeyFrame>
159-
</DoubleAnimationUsingKeyFrames>
160-
<DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)" Storyboard.TargetName="ClickBorder">
161-
<EasingDoubleKeyFrame KeyTime="0:0:0.1" Value="1"/>
162-
<EasingDoubleKeyFrame KeyTime="0:0:0.8" Value="1"/>
163-
<EasingDoubleKeyFrame KeyTime="0:0:0.81" Value="0"/>
164-
</DoubleAnimationUsingKeyFrames>
165-
</Storyboard>
166-
</ControlTemplate.Resources>
167108
<Grid>
168-
<Border Background="{DynamicResource MaterialDesignFlatButtonClick}" CornerRadius="2" x:Name="ClickBorder" Opacity="0" RenderTransformOrigin="0.5,0.5" >
169-
<Border.RenderTransform>
170-
<TransformGroup>
171-
<ScaleTransform ScaleX="0"/>
172-
<SkewTransform/>
173-
<RotateTransform/>
174-
<TranslateTransform/>
175-
</TransformGroup>
176-
</Border.RenderTransform>
177-
</Border>
178109
<Border Background="{TemplateBinding Background}" x:Name="border" CornerRadius="2">
179110
<wpf:Ripple Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False"
180111
Feedback="{DynamicResource MaterialDesignFlatButtonRipple}"
181-
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
182-
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
183-
Padding="{TemplateBinding Padding}"
184-
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
112+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
113+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
114+
Padding="{TemplateBinding Padding}"
115+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
185116
</Border>
186117
</Grid>
187118
<ControlTemplate.Triggers>
188119
<Trigger Property="IsDefaulted" Value="true">
189120
<!--Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/-->
190121
</Trigger>
191122
<Trigger Property="IsMouseOver" Value="true">
192-
<Setter Property="BorderBrush" TargetName="border" Value="{StaticResource AttentionToActionBrush}" />
123+
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource MaterialDesignFlatButtonClick}" />
193124
<Setter Property="Background" TargetName="border" Value="{DynamicResource MaterialDesignFlatButtonClick}" />
194125
</Trigger>
195126
<Trigger Property="IsEnabled" Value="false">
196127
<Setter Property="Opacity" Value="0.23"/>
197128
</Trigger>
198-
<EventTrigger RoutedEvent="Click">
199-
<!--BeginStoryboard Storyboard="{StaticResource OnClick}"/-->
200-
</EventTrigger>
201129
</ControlTemplate.Triggers>
202130
</ControlTemplate>
203131
</Setter.Value>
@@ -318,4 +246,4 @@
318246
<Setter Property="Foreground" Value="{DynamicResource SecondaryAccentForegroundBrush}"/>
319247
</Style>
320248

321-
</ResourceDictionary>
249+
</ResourceDictionary>

0 commit comments

Comments
 (0)