Call scroll completion block when scroll cancelled in more cases

cbpowell · Aug 7, 2021 · 34dc794 · 34dc794
1 parent 8349b2c
commit 34dc794
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Sources/MarqueeLabel.swift b/Sources/MarqueeLabel.swift
@@ -806,12 +806,21 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate {
     }
 
     private func returnLabelToHome() {
+        // Store if label is away from home at time of call
+        let away = awayFromHome
+
         // Remove any gradient animation
         maskLayer?.removeAllAnimations()
 
         // Remove all sublabel position animations
         sublabel.layer.removeAllAnimations()
 
+        // Fire completion block if appropriate
+        if away {
+            // If label was away when this was called, animation did NOT finish
+            scrollCompletionBlock?(!away)
+        }
+
         // Remove completion block
         scrollCompletionBlock = nil
     }