Take care of the frame right before the animation

In case a rendering is scheduled already...
ChartsOrg · Jul 14, 2015 · 15b3f43 · 15b3f43
1 parent 0f4962d
commit 15b3f43
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/Charts/Classes/Animation/ChartAnimator.swift b/Charts/Classes/Animation/ChartAnimator.swift
@@ -83,9 +83,8 @@ public class ChartAnimator: NSObject
         }
     }
 
-    @objc private func animationLoop()
+    private func updateAnimationPhases(currentTime: NSTimeInterval)
     {
-        var currentTime: NSTimeInterval = CACurrentMediaTime()
         var elapsedTime: NSTimeInterval = currentTime - _startTime
         if (_enabledX)
         {
@@ -123,6 +122,13 @@ public class ChartAnimator: NSObject
                 phaseY = CGFloat(elapsed / duration)
             }
         }
+    }
+
+    @objc private func animationLoop()
+    {
+        var currentTime: NSTimeInterval = CACurrentMediaTime()
+
+        updateAnimationPhases(currentTime)
 
         if (delegate != nil)
         {
@@ -163,6 +169,9 @@ public class ChartAnimator: NSObject
         _easingX = easingX
         _easingY = easingY
 
+        // Take care of the first frame if rendering is already scheduled...
+        updateAnimationPhases(_startTime)
+
         if (_enabledX || _enabledY)
         {
             _displayLink.addToRunLoop(NSRunLoop.mainRunLoop(), forMode: NSRunLoopCommonModes)
@@ -260,4 +269,4 @@ public class ChartAnimator: NSObject
     {
         animate(xAxisDuration: 0.0, yAxisDuration: yAxisDuration, easingOption: .EaseInOutSine)
     }
-}
+}