Remove gradient mask in the case of labelization [common]

cbpowell · Jul 9, 2016 · f201564 · f201564
1 parent 940acfc
commit f201564
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Sources/ObjC/MarqueeLabel.m b/Sources/ObjC/MarqueeLabel.m
@@ -350,6 +350,9 @@ - (void)updateSublabelAndBeginScroll:(BOOL)beginScroll {
         // Set sublabel frame calculated labelFrame
         self.subLabel.frame = labelFrame;
 
+        // Remove fade, as by definition none is needed in this case
+        [self removeGradientMask];
+
         return;
     }
 

diff --git a/Sources/Swift/MarqueeLabel.swift b/Sources/Swift/MarqueeLabel.swift
@@ -565,8 +565,8 @@ public class MarqueeLabel: UILabel {
             // Set the sublabel frame to calculated labelFrame
             sublabel.frame = labelFrame
 
-            // Configure fade
-            applyGradientMask(fadeLength, animated: !labelize)
+            // Remove fade, as by definition none is needed in this case
+            removeGradientMask()
 
             return
         }
@@ -633,7 +633,7 @@ public class MarqueeLabel: UILabel {
         }()
 
         // Configure gradient for current condition
-        applyGradientMask(fadeLength, animated: !self.labelize)
+        applyGradientMask(fadeLength, animated: !labelize)
 
         if !tapToScroll && !holdScrolling && shouldBeginScroll {
             beginScroll()