Use safer float comparison when checking if label should scroll (fixes …

…#151)[common]
cbpowell · Aug 5, 2016 · b97ec74 · b97ec74
1 parent 1f9eab2
commit b97ec74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Sources/ObjC/MarqueeLabel.m b/Sources/ObjC/MarqueeLabel.m
@@ -479,7 +479,7 @@ - (BOOL)labelShouldScroll {
         return NO;
     }
 
-    BOOL labelTooLarge = ([self subLabelSize].width + self.leadingBuffer > self.bounds.size.width);
+    BOOL labelTooLarge = ([self subLabelSize].width + self.leadingBuffer > self.bounds.size.width + FLT_EPSILON);
     BOOL animationHasDuration = (self.scrollDuration > 0.0f || self.rate > 0.0f);
     return (!self.labelize && labelTooLarge && animationHasDuration);
 }

diff --git a/Sources/Swift/MarqueeLabel.swift b/Sources/Swift/MarqueeLabel.swift
@@ -681,7 +681,7 @@ public class MarqueeLabel: UILabel {
         }
 
         // Check if the label string fits
-        let labelTooLarge = (sublabelSize().width + leadingBuffer) > self.bounds.size.width
+        let labelTooLarge = (sublabelSize().width + leadingBuffer) > self.bounds.size.width + CGFloat(FLT_EPSILON)
         let animationHasDuration = speed.value > 0.0
         return (!labelize && labelTooLarge && animationHasDuration)
     }