Merge branch 'master' of https://github.com/hariseldon78/MarqueeLabel into hariseldon78-master

cbpowell · cbpowell · commit 9ce2ef6166bb · 2021-07-20T18:32:09.000-07:00
diff --git a/Sources/MarqueeLabel.swift b/Sources/MarqueeLabel.swift
@@ -153,6 +153,8 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate {
         }
     }
     
+	@IBInspectable public var forceScrolling: Bool = false
+	
     /**
      A boolean property that sets whether the `MarqueeLabel` should only begin a scroll when tapped.
      
@@ -780,7 +782,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate {
         }
 
         let animationHasDuration = speed.value > 0.0
-        return (!labelize && labelTooLarge && animationHasDuration)
+        return (!labelize && (forceScrolling || labelTooLarge) && animationHasDuration)
     }
     
     private func labelReadyForScroll() -> Bool {

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,8 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate {`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
	`156`	`+ @IBInspectable public var forceScrolling: Bool = false`
	`157`	`+`
`156`	`158`	`/**`
`157`	`159`	A boolean property that sets whether the `MarqueeLabel` should only begin a scroll when tapped.
`158`	`160`
`@@ -780,7 +782,7 @@ open class MarqueeLabel: UILabel, CAAnimationDelegate {`
`780`	`782`	`}`
`781`	`783`
`782`	`784`	`let animationHasDuration = speed.value > 0.0`
`783`		`- return (!labelize && labelTooLarge && animationHasDuration)`
	`785`	`+ return (!labelize && (forceScrolling \|\| labelTooLarge) && animationHasDuration)`
`784`	`786`	`}`
`785`	`787`
`786`	`788`	`private func labelReadyForScroll() -> Bool {`