Merge remote-tracking branch 'ButchersBoy/master'

Conflicts:
	MaterialDesignThemes.Wpf/Ripple.cs
	MaterialDesignThemes.Wpf/Themes/Generic.xaml

Author: l1pton17

MaterialDesignThemes.Wpf/Ripple.cs

@@ -18,12 +18,12 @@
 
 namespace MaterialDesignThemes.Wpf
 {
-    [TemplatePart(Name = PartBubbleEllipse, Type = typeof(Ellipse))]
+    [TemplateVisualState(GroupName = "CommonStates", Name = TemplateStateNormal)]
+    [TemplateVisualState(GroupName = "CommonStates", Name = TemplateStateMousePressed)]
     public class Ripple : ContentControl
     {
-        public const string PartBubbleEllipse = "PART_BubbleEllipse";
-
-        private BubbleStoryboardController _bubbleStoryboardController;
+        public const string TemplateStateNormal = "Normal";
+        public const string TemplateStateMousePressed = "MousePressed";
 
         static Ripple()
         {
@@ -32,250 +32,111 @@ static Ripple()
 
         public Ripple()
         {
-            MouseMove += OnMouseMove;
-        }
-
-        protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
-        {
-            var position = e.GetPosition(this);
-            MouseLeftButtonDownX = position.X;
-            MouseLeftButtonDownY = position.Y;
-
-            this.ReleaseMouseCapture();
-
-            base.OnPreviewMouseLeftButtonDown(e);
-        }
-
-        private void OnMouseMove(object sender, MouseEventArgs mouseEventArgs)
-        {
-            var position = mouseEventArgs.GetPosition(this);
-            MouseX = position.X;
-            MouseY = position.Y;
-        }
-
-        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); }
+            SizeChanged += OnSizeChanged;
         }
 
-        public override void OnApplyTemplate()
+        private void OnSizeChanged(object sender, SizeChangedEventArgs sizeChangedEventArgs)
         {
-            base.OnApplyTemplate();
-
-            _bubbleStoryboardController = new BubbleStoryboardController(this);
+            double radius = Math.Sqrt(Math.Pow(sizeChangedEventArgs.NewSize.Width, 2) + Math.Pow(sizeChangedEventArgs.NewSize.Height, 2));
+            RippleSize = 2 * radius * RippleSizeMultiplier;
         }
 
-        private void StartBubbleAnimation()
-        {
-            _bubbleStoryboardController.Add();
-        }
+        public static readonly DependencyProperty FeedbackProperty = DependencyProperty.Register(
+            "Feedback", typeof(Brush), typeof(Ripple), new PropertyMetadata(default(Brush)));
 
-        private void StopBubbleAnimation()
+        public Brush Feedback
         {
-            _bubbleStoryboardController.Remove();
+            get { return (Brush)GetValue(FeedbackProperty); }
+            set { SetValue(FeedbackProperty, value); }
         }
 
-        private static void IsActivePropertyChangedCallback(
-            DependencyObject dependencyObject,
-            DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+        protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
         {
-            var box = dependencyObject as Ripple;
-            if (box == null) return;
+            var point = e.GetPosition(this);
 
-            bool isActive = (bool)dependencyPropertyChangedEventArgs.NewValue;
+            RippleX = point.X - RippleSize / 2;
+            RippleY = point.Y - RippleSize / 2;
 
-            if (isActive)
-            {
-                box.StartBubbleAnimation();
-            }
-            else
-            {
-                box.StopBubbleAnimation();
-            }
+            base.OnPreviewMouseLeftButtonDown(e);
         }
 
-        public static readonly DependencyProperty FeedbackProperty = DependencyProperty.Register(
-            "Feedback", typeof(Brush), typeof(Ripple), new PropertyMetadata(default(Brush)));
+        public static readonly DependencyProperty RippleSizeMultiplierProperty = DependencyProperty.Register(
+            "RippleSizeMultiplier", typeof(double), typeof(Ripple), new PropertyMetadata(1.0));
 
-        public Brush Feedback
+        public double RippleSizeMultiplier
         {
-            get { return (Brush)GetValue(FeedbackProperty); }
-            set { SetValue(FeedbackProperty, value); }
+            get { return (double)GetValue(RippleSizeMultiplierProperty); }
+            set { SetValue(RippleSizeMultiplierProperty, value); }
         }
 
-        private static readonly DependencyPropertyKey MouseXPropertyKey =
+        private static readonly DependencyPropertyKey RippleSizePropertyKey =
             DependencyProperty.RegisterReadOnly(
-                "MouseX", typeof(double), typeof(Ripple),
+                "RippleSize", typeof(double), typeof(Ripple),
                 new PropertyMetadata(default(double)));
 
-        public static readonly DependencyProperty MouseXProperty =
-            MouseXPropertyKey.DependencyProperty;
+        public static readonly DependencyProperty RippleSizeProperty =
+            RippleSizePropertyKey.DependencyProperty;
 
-        public double MouseX
+        public double RippleSize
         {
-            get { return (double)GetValue(MouseXProperty); }
-            private set { SetValue(MouseXPropertyKey, value); }
+            get { return (double)GetValue(RippleSizeProperty); }
+            private set { SetValue(RippleSizePropertyKey, value); }
         }
 
-        private static readonly DependencyPropertyKey MouseYPropertyKey =
+        private static readonly DependencyPropertyKey RippleXPropertyKey =
             DependencyProperty.RegisterReadOnly(
-                "MouseY", typeof(double), typeof(Ripple),
+                "RippleX", typeof(double), typeof(Ripple),
                 new PropertyMetadata(default(double)));
 
-        public static readonly DependencyProperty MouseYProperty =
-            MouseYPropertyKey.DependencyProperty;
+        public static readonly DependencyProperty RippleXProperty =
+            RippleXPropertyKey.DependencyProperty;
 
-        public double MouseY
+        public double RippleX
         {
-            get { return (double)GetValue(MouseYProperty); }
-            private set { SetValue(MouseYPropertyKey, value); }
+            get { return (double)GetValue(RippleXProperty); }
+            private set { SetValue(RippleXPropertyKey, value); }
         }
 
-        private static readonly DependencyPropertyKey MouseLeftButtonDownXPropertyKey =
+        private static readonly DependencyPropertyKey RippleYPropertyKey =
             DependencyProperty.RegisterReadOnly(
-                "MouseLeftButtonDownX", typeof(double), typeof(Ripple),
+                "RippleY", typeof(double), typeof(Ripple),
                 new PropertyMetadata(default(double)));
 
-        public static readonly DependencyProperty MouseLeftButtonDownXProperty =
-            MouseLeftButtonDownXPropertyKey.DependencyProperty;
+        public static readonly DependencyProperty RippleYProperty =
+            RippleYPropertyKey.DependencyProperty;
 
-        public double MouseLeftButtonDownX
+        public double RippleY
         {
-            get { return (double)GetValue(MouseLeftButtonDownXProperty); }
-            private set { SetValue(MouseLeftButtonDownXPropertyKey, value); }
+            get { return (double)GetValue(RippleYProperty); }
+            private set { SetValue(RippleYPropertyKey, value); }
         }
 
-        private static readonly DependencyPropertyKey MouseLeftButtonDownYPropertyKey =
-            DependencyProperty.RegisterReadOnly(
-                "MouseLeftButtonDownY", typeof(double), typeof(Ripple),
-                new PropertyMetadata(default(double)));
-
-        public static readonly DependencyProperty MouseLeftButtonDownYProperty =
-            MouseLeftButtonDownYPropertyKey.DependencyProperty;
+        public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register(
+            "IsActive", typeof(bool), typeof(Ripple), new FrameworkPropertyMetadata(false, IsActivePropertyChangedCallback));
 
-        public double MouseLeftButtonDownY
+        public bool IsActive
         {
-            get { return (double)GetValue(MouseLeftButtonDownYProperty); }
-            private set { SetValue(MouseLeftButtonDownYPropertyKey, value); }
+            get { return (bool)GetValue(IsActiveProperty); }
+            set { SetValue(IsActiveProperty, value); }
         }
 
-
-        private sealed class BubbleStoryboardController
+        private static void IsActivePropertyChangedCallback(
+            DependencyObject dependencyObject,
+            DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
         {
-            private readonly Ripple _ripple;
-            private readonly Ellipse _ellipse;
-            private readonly TimeSpan _fadeOutDuration = TimeSpan.FromMilliseconds(200);
-            private readonly TimeSpan _bubbleDuration = TimeSpan.FromMilliseconds(400);
-
-            private volatile Storyboard _currentBubbleStoryboard;
-            private volatile Storyboard _currentFadeOutStoryboard;
-
-            public BubbleStoryboardController(Ripple ripple)
-            {
-                _ripple = ripple;
-                _ellipse = _ripple.Template.FindName(PartBubbleEllipse, _ripple) as Ellipse;
-
-                if (_ellipse == null) throw new InvalidOperationException();
-            }
-            public void Add()
-            {
-                _currentFadeOutStoryboard?.Remove();
-                _currentBubbleStoryboard?.Remove();
-
-                _currentBubbleStoryboard = CreateBubbleStoryboard();
-                _currentBubbleStoryboard.Begin();
-            }
-
-            public void Remove()
-            {
-                _currentFadeOutStoryboard?.Remove();
-
-                var fadeOutStoryboard = CreateFadeOutStoryboard();
-                var bubbleStoryboardLocalCopy = _currentBubbleStoryboard;
-
-                fadeOutStoryboard.Completed += delegate
-                {
-                    fadeOutStoryboard.Remove();
-                    bubbleStoryboardLocalCopy?.Remove();
-                };
-
-                _currentFadeOutStoryboard = fadeOutStoryboard;
-                _currentFadeOutStoryboard.Begin();
-            }
-
-            private Storyboard CreateFadeOutStoryboard()
-            {
-                Storyboard resultStorybaord = new Storyboard();
-
-                DoubleAnimation opacityAnimation = new DoubleAnimation
-                {
-                    To = 0
-                };
-                SetupAnimation(opacityAnimation, _fadeOutDuration, "(UIElement.Opacity)");
-
-                resultStorybaord.Children.Add(opacityAnimation);
-
-                return resultStorybaord;
-            }
-
-            private Storyboard CreateBubbleStoryboard()
-            {
-                Storyboard resultStorybaord = new Storyboard();
-
-                DoubleAnimation opacityAnimation = new DoubleAnimation
-                {
-                    To = 0.26,
-                };
-                SetupAnimation(opacityAnimation, _bubbleDuration, "(UIElement.Opacity)");
-
-                double h = Math.Max(_ripple.MouseLeftButtonDownX, _ripple.ActualWidth - _ripple.MouseLeftButtonDownX);
-                double w = Math.Max(_ripple.MouseLeftButtonDownY, _ripple.ActualHeight - _ripple.MouseLeftButtonDownY);
-                double diameter = 2 * Math.Sqrt(h * h + w * w);
-
-                DoubleAnimation widthAnimation = new DoubleAnimation
-                {
-                    To = diameter
-                };
-                SetupAnimation(widthAnimation, _bubbleDuration, "(FrameworkElement.Width)");
-
-                DoubleAnimation heightAnimation = new DoubleAnimation
-                {
-                    To = diameter
-                };
-                SetupAnimation(heightAnimation, _bubbleDuration, "(FrameworkElement.Height)");
-
-                DoubleAnimation translateXAnimation = new DoubleAnimation
-                {
-                    To = -diameter / 2
-                };
-                SetupAnimation(translateXAnimation, _bubbleDuration, "(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)");
+            var box = dependencyObject as Ripple;
+            if (box == null) return;
 
-                DoubleAnimation translateYAnimation = new DoubleAnimation
-                {
-                    To = -diameter / 2
-                };
-                SetupAnimation(translateYAnimation, _bubbleDuration, "(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)");
+            bool isActive = (bool)dependencyPropertyChangedEventArgs.NewValue;
 
-                resultStorybaord.Children.Add(opacityAnimation);
-                resultStorybaord.Children.Add(widthAnimation);
-                resultStorybaord.Children.Add(heightAnimation);
-                resultStorybaord.Children.Add(translateXAnimation);
-                resultStorybaord.Children.Add(translateYAnimation);
+            VisualStateManager.GoToState(box, isActive ? TemplateStateMousePressed : TemplateStateNormal, true);
+        }
 
-                return resultStorybaord;
-            }
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
 
-            private void SetupAnimation(AnimationTimeline animation, TimeSpan duration, string propertyPath)
-            {
-                animation.AccelerationRatio = 0.25;
-                animation.Duration = new Duration(duration);
-                Storyboard.SetTarget(animation, _ellipse);
-                Storyboard.SetTargetProperty(animation, new PropertyPath(propertyPath));
-            }
+            VisualStateManager.GoToState(this, TemplateStateNormal, false);
         }
     }
 }