Fix not using IsActive

Add IsActive property to all using of ripple

Author: l1pton17

MaterialDesignThemes.Wpf/Ripple.cs

@@ -37,7 +37,11 @@ public Ripple()
 
         private void OnSizeChanged(object sender, SizeChangedEventArgs sizeChangedEventArgs)
         {
-            double radius = Math.Sqrt(Math.Pow(sizeChangedEventArgs.NewSize.Width, 2) + Math.Pow(sizeChangedEventArgs.NewSize.Height, 2));
+            double width = sizeChangedEventArgs.NewSize.Width;
+            double height = sizeChangedEventArgs.NewSize.Height;
+            double radius = Math.Sqrt(Math.Pow(width, 2) + Math.Pow(height, 2));
+
+            Debug.WriteLine("Width: {0} Height: {1} Radius: {2}", width, height, radius);
             RippleSize = 2 * radius * RippleSizeMultiplier;
         }
 

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.Calendar.xaml

@@ -295,12 +295,17 @@
                                                     </VisualState>
                                                 </VisualStateGroup>
                                             </VisualStateManager.VisualStateGroups>
-                                            <wpf:Ripple HorizontalAlignment="Center" VerticalAlignment="Center">
+                                            <wpf:Ripple x:Name="RippleWrapper" HorizontalAlignment="Center" VerticalAlignment="Center">
                                                 <Viewbox Height="12" Margin="8">
                                                     <Path x:Name="path" Data="M288.75,232.25 L288.75,240.625 L283,236.625 z" Fill="{TemplateBinding Foreground}" Stretch="Fill" />
                                                 </Viewbox>
                                             </wpf:Ripple>
                                         </Grid>
+                                        <ControlTemplate.Triggers>
+                                            <Trigger Property="IsPressed" Value="True">
+                                                <Setter TargetName="RippleWrapper" Property="IsActive" Value="True"/>
+                                            </Trigger>
+                                        </ControlTemplate.Triggers>
                                     </ControlTemplate>
                                     <ControlTemplate x:Key="NextButtonTemplate" TargetType="{x:Type Button}">
                                         <Grid Cursor="Hand">
@@ -315,12 +320,17 @@
                                                     </VisualState>
                                                 </VisualStateGroup>
                                             </VisualStateManager.VisualStateGroups>
-                                            <wpf:Ripple HorizontalAlignment="Center" VerticalAlignment="Center">
+                                            <wpf:Ripple x:Name="RippleWrapper" HorizontalAlignment="Center" VerticalAlignment="Center">
                                                 <Viewbox Height="12" Margin="8">
                                                     <Path x:Name="path" Data="M282.875,231.875 L282.875,240.375 L288.625,236 z" Fill="{TemplateBinding Foreground}" Stretch="Fill"  />
                                                 </Viewbox>
                                             </wpf:Ripple>
                                         </Grid>
+                                        <ControlTemplate.Triggers>
+                                            <Trigger Property="IsPressed" Value="True">
+                                                <Setter TargetName="RippleWrapper" Property="IsActive" Value="True"/>
+                                            </Trigger>
+                                        </ControlTemplate.Triggers>
                                     </ControlTemplate>
                                     <ControlTemplate x:Key="HeaderButtonTemplate" TargetType="{x:Type Button}">
                                         <Grid Cursor="Hand">

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RatingBar.xaml

@@ -28,7 +28,8 @@
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="wpf:RatingBarButton">
-                                    <wpf:Ripple Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False"                                                                                                               
+                                    <wpf:Ripple Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False"     
+                                                x:Name="RippleWrapper"
                                                 Feedback="{DynamicResource MaterialDesignFlatButtonRipple}"
                                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
                                                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
@@ -40,6 +41,9 @@
                                         </wpf:Ripple.RenderTransform>
                                     </wpf:Ripple>
                                     <ControlTemplate.Triggers>
+                                        <Trigger Property="IsPressed" Value="True">
+                                            <Setter TargetName="RippleWrapper" Property="IsActive" Value="True"/>
+                                        </Trigger>
                                         <EventTrigger RoutedEvent="Click">
                                             <EventTrigger.Actions>
                                                 <BeginStoryboard>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml

@@ -227,16 +227,20 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
                     <wpf:Ripple Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False"
-                                                      Feedback="{TemplateBinding Foreground}"
-                                                      ClipToBounds="False"
-                                                      HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
-                                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                      Padding="{TemplateBinding Padding}" 
-                                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                x:Name="RippleWrapper"
+                                Feedback="{TemplateBinding Foreground}"
+                                ClipToBounds="False"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Padding="{TemplateBinding Padding}" 
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="false">
                             <Setter Property="Opacity" Value=".56"/>
                         </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="RippleWrapper" Property="IsActive" Value="True"/>
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>