few more ripple tweaks...get rid of IsActive

Author: ButchersBoy

MainDemo.Wpf/Cards.xaml

@@ -40,7 +40,7 @@
                 </StackPanel>
                 <StackPanel HorizontalAlignment="Right" Grid.Row="2" Orientation="Horizontal" Margin="8">
                     <Button Style="{StaticResource MaterialDesignToolButton}" Width="30" Padding="2 0 2 0"
-                            wpf:RippleAssist.StayOnCenter="True">
+                            wpf:RippleAssist.IsCentered="True">
                         <Viewbox Width="16" Height="16">
                             <Canvas Width="24" Height="24">
                                 <Path Data="M18,16.08C17.24,16.08 16.56,16.38 16.04,16.85L8.91,12.7C8.96,12.47 9,12.24 9,12C9,11.76 8.96,11.53 8.91,11.3L15.96,7.19C16.5,7.69 17.21,8 18,8A3,3 0 0,0 21,5A3,3 0 0,0 18,2A3,3 0 0,0 15,5C15,5.24 15.04,5.47 15.09,5.7L8.04,9.81C7.5,9.31 6.79,9 6,9A3,3 0 0,0 3,12A3,3 0 0,0 6,15C6.79,15 7.5,14.69 8.04,14.19L15.16,18.34C15.11,18.55 15.08,18.77 15.08,19C15.08,20.61 16.39,21.91 18,21.91C19.61,21.91 20.92,20.61 20.92,19A2.92,2.92 0 0,0 18,16.08Z" 
@@ -49,7 +49,7 @@
                         </Viewbox>
                     </Button>
                     <Button Style="{StaticResource MaterialDesignToolButton}" Width="30" Padding="2 0 2 0"
-                            wpf:RippleAssist.StayOnCenter="True">
+                            wpf:RippleAssist.IsCentered="True">
                         <Viewbox Width="16" Height="16">
                             <Canvas Width="24" Height="24">
                                 <Path Data="M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z" 

MainDemo.Wpf/ColorZones.xaml

@@ -19,7 +19,7 @@
                         <TextBlock VerticalAlignment="Center" Margin="16 0 0 0">Material Design In XAML Toolkit</TextBlock>
                     </StackPanel>
                     <Button Style="{DynamicResource MaterialDesignToolForegroundButton}" DockPanel.Dock="Right" HorizontalAlignment="Right"
-                            wpf:RippleAssist.StayOnCenter="True">
+                            wpf:RippleAssist.IsCentered="True">
                         <Viewbox Width="16" Height="16">
                             <Canvas Width="24" Height="24">
                                 <Path Data="M2,21L23,12L2,3V10L17,12L2,14V21Z" Fill="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=Button}, Path=Foreground}" />
@@ -38,7 +38,7 @@
             <TextBlock Margin="0 16 0 0" FontSize="10">Use primary mid colours, and nest colour zones!</TextBlock>
             <wpf:ColorZone Mode="PrimaryMid" Padding="16">
                 <StackPanel Orientation="Horizontal"
-                            wpf:RippleAssist.StayOnCenter="True">
+                            wpf:RippleAssist.IsCentered="True">
                     <ToggleButton Style="{DynamicResource MaterialDesignHamburgerToggleButton}" />
                     <wpf:ColorZone Mode="Standard" Padding="8 4 8 4" CornerRadius="2" Panel.ZIndex="1"
                                    Margin="16 0 0 0"

MaterialDesignThemes.Wpf/Ripple.cs

@@ -26,14 +26,27 @@ public class Ripple : ContentControl
         public const string TemplateStateNormal = "Normal";
         public const string TemplateStateMousePressed = "MousePressed";
 
+        private static readonly HashSet<Ripple> LoadedInstances = new HashSet<Ripple>();
+
         static Ripple()
-        {
+        {                        
             DefaultStyleKeyProperty.OverrideMetadata(typeof(Ripple), new FrameworkPropertyMetadata(typeof(Ripple)));
+
+            EventManager.RegisterClassHandler(typeof(Window), Mouse.PreviewMouseUpEvent, new MouseButtonEventHandler(MouseButtonEventHandler), true);
         }
 
         public Ripple()
-        {
+        {            
             SizeChanged += OnSizeChanged;
+
+            Loaded += (sender, args) => LoadedInstances.Add((Ripple) sender);
+            Unloaded += (sender, args) => LoadedInstances.Remove((Ripple)sender);
+        }        
+
+        private static void MouseButtonEventHandler(object sender, MouseButtonEventArgs e)
+        {
+            foreach (var loadedInstance in LoadedInstances)
+                VisualStateManager.GoToState(loadedInstance, TemplateStateNormal, false);
         }
 
         private void OnSizeChanged(object sender, SizeChangedEventArgs sizeChangedEventArgs)
@@ -42,7 +55,7 @@ private void OnSizeChanged(object sender, SizeChangedEventArgs sizeChangedEventA
 
             double width, height;
 
-            if (RippleAssist.GetStayOnCenter(this) && innerContent != null)
+            if (RippleAssist.GetIsCentered(this) && innerContent != null)
             {
                 width = innerContent.ActualWidth;
                 height = innerContent.ActualHeight;
@@ -53,7 +66,7 @@ private void OnSizeChanged(object sender, SizeChangedEventArgs sizeChangedEventA
                 height = sizeChangedEventArgs.NewSize.Height;
             }
 
-            double radius = Math.Sqrt(Math.Pow(width, 2) + Math.Pow(height, 2));
+            var radius = Math.Sqrt(Math.Pow(width, 2) + Math.Pow(height, 2));
 
             RippleSize = 2 * radius * RippleAssist.GetRippleSizeMultiplier(this);
         }
@@ -71,13 +84,13 @@ protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
         {
             var point = e.GetPosition(this);
 
-            if (RippleAssist.GetStayOnCenter(this))
+            if (RippleAssist.GetIsCentered(this))
             {
                 var innerContent = (Content as FrameworkElement);
 
                 if (innerContent != null)
                 {
-                    Point position = innerContent.TransformToAncestor(this)
+                    var position = innerContent.TransformToAncestor(this)
                         .Transform(new Point(0, 0));
 
                     RippleX = position.X + innerContent.ActualWidth / 2 - RippleSize / 2;
@@ -94,7 +107,9 @@ protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
                 RippleX = point.X - RippleSize / 2;
                 RippleY = point.Y - RippleSize / 2;
             }
-			
+
+            VisualStateManager.GoToState(this, TemplateStateMousePressed, true);
+
             base.OnPreviewMouseLeftButtonDown(e);
         }
 
@@ -138,44 +153,12 @@ public double RippleY
         {
             get { return (double)GetValue(RippleYProperty); }
             private set { SetValue(RippleYPropertyKey, value); }
-        }
-
-        public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register(
-            "IsActive", typeof(bool), typeof(Ripple), new FrameworkPropertyMetadata(false, IsActivePropertyChangedCallback));
-
-        public bool IsActive
-        {
-            get { return (bool)GetValue(IsActiveProperty); }
-            set { SetValue(IsActiveProperty, value); }
-        }
-
-        private static void IsActivePropertyChangedCallback(
-            DependencyObject dependencyObject,
-            DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
-        {
-            var box = dependencyObject as Ripple;
-            if (box == null) return;
-
-            bool isActive = (bool)dependencyPropertyChangedEventArgs.NewValue;
-
-            VisualStateManager.GoToState(box, isActive ? TemplateStateMousePressed : TemplateStateNormal, true);
-        }
+        }       
 
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
-
-            var button = (TemplatedParent as ButtonBase);
-            if (button != null)
-            {
-                Binding isPressedBinding = new Binding
-                {
-                    Path = new PropertyPath("IsPressed"),
-                    Source = button
-                };
-                this.SetBinding(Ripple.IsActiveProperty, isPressedBinding);
-            }
-            
+                        
             VisualStateManager.GoToState(this, TemplateStateNormal, false);
         }
     }

MaterialDesignThemes.Wpf/RippleAssist.cs

@@ -23,17 +23,17 @@ public static bool GetClipToBounds(DependencyObject element)
 
         #region StayOnCenter
 
-        public static readonly DependencyProperty StayOnCenterProperty = DependencyProperty.RegisterAttached(
-            "StayOnCenter", typeof(bool), typeof(RippleAssist), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.Inherits));
+        public static readonly DependencyProperty IsCenteredProperty = DependencyProperty.RegisterAttached(
+            "IsCentered", typeof(bool), typeof(RippleAssist), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.Inherits));
 
-        public static void SetStayOnCenter(DependencyObject element, bool value)
+        public static void SetIsCentered(DependencyObject element, bool value)
         {
-            element.SetValue(StayOnCenterProperty, value);
+            element.SetValue(IsCenteredProperty, value);
         }
 
-        public static bool GetStayOnCenter(DependencyObject element)
+        public static bool GetIsCentered(DependencyObject element)
         {
-            return (bool)element.GetValue(StayOnCenterProperty);
+            return (bool)element.GetValue(IsCenteredProperty);
         }
 
         #endregion

MaterialDesignThemes.Wpf/Themes/Generic.xaml

@@ -43,24 +43,24 @@
                                         <Storyboard>
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="ScaleTransform">
                                                 <EasingDoubleKeyFrame KeyTime="0" Value="0"/>
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="1">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:2.2" Value="1">
                                                     <EasingDoubleKeyFrame.EasingFunction>
-                                                        <SineEase EasingMode="EaseInOut" />
+                                                        <SineEase EasingMode="EaseIn" />
                                                     </EasingDoubleKeyFrame.EasingFunction>
                                                 </EasingDoubleKeyFrame>
                                             </DoubleAnimationUsingKeyFrames>
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="ScaleY" Storyboard.TargetName="ScaleTransform">
                                                 <EasingDoubleKeyFrame KeyTime="0" Value="0"/>
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.4" Value="1">
+                                                <EasingDoubleKeyFrame KeyTime="0:0:2.2" Value="1">
                                                     <EasingDoubleKeyFrame.EasingFunction>
-                                                        <SineEase EasingMode="EaseInOut" />
+                                                        <SineEase EasingMode="EaseIn" />
                                                     </EasingDoubleKeyFrame.EasingFunction>
                                                 </EasingDoubleKeyFrame>
                                             </DoubleAnimationUsingKeyFrames>
                                             <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="Opacity" Storyboard.TargetName="ClickEllipse">
                                                 <EasingDoubleKeyFrame KeyTime="0" Value="0"/>
                                                 <EasingDoubleKeyFrame KeyTime="0:0:0.05" Value=".26"/>
-                                                <EasingDoubleKeyFrame KeyTime="0:0:0.2" Value=".26"/>
+                                                <EasingDoubleKeyFrame KeyTime="0:0:2.2" Value=".26"/>
                                             </DoubleAnimationUsingKeyFrames>
                                         </Storyboard>
                                     </VisualTransition>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.RatingBar.xaml

@@ -25,7 +25,7 @@
                         <Setter Property="Command" Value="{x:Static wpf:RatingBar.SelectRatingCommand}"/>
                         <Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Self}, Path=Value}"/>
                         <Setter Property="wpf:RippleAssist.ClipToBounds" Value="False"/>
-                        <Setter Property="wpf:RippleAssist.StayOnCenter" Value="True"/>
+                        <Setter Property="wpf:RippleAssist.IsCentered" Value="True"/>
                         <Setter Property="wpf:RippleAssist.RippleSizeMultiplier" Value="0.5"/>
                         <Setter Property="Template">
                             <Setter.Value>

MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml

@@ -223,7 +223,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="TextBlock.FontWeight" Value="DemiBold"/>
         <Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}"/>
-        <Setter Property="wpf:RippleAssist.StayOnCenter" Value="True"/>
+        <Setter Property="wpf:RippleAssist.IsCentered" Value="True"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">