From 5c8ced89a30e3339f070d75b3f361f8342ae99fa Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Thu, 6 Sep 2018 22:52:41 -0500
Subject: [PATCH] Move GlobalPlayState tracking to Clock.

---
 src/Avalonia.Animation/Animation.cs | 7 ++++++-
 src/Avalonia.Animation/Clock.cs     | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Animation/Animation.cs b/src/Avalonia.Animation/Animation.cs
index 2c359ecac3..7b3aa06ea0 100644
--- a/src/Avalonia.Animation/Animation.cs
+++ b/src/Avalonia.Animation/Animation.cs
@@ -17,10 +17,15 @@ namespace Avalonia.Animation
     /// </summary>
     public class Animation : AvaloniaList<KeyFrame>, IAnimation
     {
+
         /// <summary>
         /// Gets or sets the animation play state for all animations
         /// </summary> 
-        public static PlayState GlobalPlayState { get; set; } = PlayState.Run;
+        public static PlayState GlobalPlayState
+        {
+            get => AvaloniaLocator.Current.GetService<Clock>().PlayState;
+            set => AvaloniaLocator.Current.GetService<Clock>().PlayState = value;
+        }
 
         /// <summary>
         /// Gets or sets the active time of this animation.
diff --git a/src/Avalonia.Animation/Clock.cs b/src/Avalonia.Animation/Clock.cs
index 4c37d663b1..1ba6425551 100644
--- a/src/Avalonia.Animation/Clock.cs
+++ b/src/Avalonia.Animation/Clock.cs
@@ -24,6 +24,8 @@ namespace Avalonia.Animation
 
         public TimeSpan CurrentTime { get; private set; }
 
+        public PlayState PlayState { get; set; }
+
         public void Pulse(long tickCount)
         {
             var time = TimeSpan.FromMilliseconds(tickCount);