From c85452199245448383817e679ce8d7b8c4b0ad1c Mon Sep 17 00:00:00 2001
From: Jumar Macato <hikari.netto23@gmail.com>
Date: Sat, 14 Apr 2018 21:58:16 +0800
Subject: [PATCH] Fixed delay logic on keyframe statemachine.

---
 samples/RenderTest/Pages/AnimationsPage.xaml              | 2 +-
 src/Avalonia.Animation/Keyframes/KeyFramesStateMachine.cs | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/samples/RenderTest/Pages/AnimationsPage.xaml b/samples/RenderTest/Pages/AnimationsPage.xaml
index e8ae637ed4..6e5085d99d 100644
--- a/samples/RenderTest/Pages/AnimationsPage.xaml
+++ b/samples/RenderTest/Pages/AnimationsPage.xaml
@@ -18,7 +18,7 @@
       <Style Selector="Border.Rect1:pointerover">
         <Setter Property="Opacity" Value="0.5"/>
         <Style.Animations>
-          <Animation Duration="0:0:2.5" Easing="SineEaseInOut">
+          <Animation Duration="0:0:2.5" Easing="SineEaseInOut" Delay="0:0:5">
             <TransformKeyFrames Property="RotateTransform.Angle">
               <KeyFrame Cue="0%" Value="0"/>
               <KeyFrame Cue="100%" Value="360"/>
diff --git a/src/Avalonia.Animation/Keyframes/KeyFramesStateMachine.cs b/src/Avalonia.Animation/Keyframes/KeyFramesStateMachine.cs
index 454974ec02..2584df5980 100644
--- a/src/Avalonia.Animation/Keyframes/KeyFramesStateMachine.cs
+++ b/src/Avalonia.Animation/Keyframes/KeyFramesStateMachine.cs
@@ -82,7 +82,10 @@ namespace Avalonia.Animation.Keyframes
                     break;
             }
 
-            _currentState = KeyFramesStates.DO_RUN;
+            if (_durationTotalFrameCount > 0)
+                _currentState = KeyFramesStates.DO_DELAY;
+            else
+                _currentState = KeyFramesStates.DO_RUN;
         }
 
         public double Step(PlayState _playState, Func<double, T> Interpolator)
@@ -106,9 +109,10 @@ namespace Avalonia.Animation.Keyframes
             switch (_currentState)
             {
                 case KeyFramesStates.DO_DELAY:
-                    if (_delayFrameCount >= _delayTotalFrameCount)
+                    if (_delayFrameCount > _delayTotalFrameCount)
                     {
                         _currentState = KeyFramesStates.DO_RUN;
+                        goto checkstate;
                     }
                     _delayFrameCount++;
                     return 0d;