Use sizeThatFits for sublabel sizing.

cbpowell · Oct 19, 2014 · 23d12a3 · 23d12a3
1 parent 56d5b47
commit 23d12a3
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/MarqueeLabel.m b/MarqueeLabel.m
@@ -238,7 +238,6 @@ - (void)minimizeLabelFrameWithMaximumSize:(CGSize)maxSize adjustHeight:(BOOL)adj
         }
         CGSize minimumLabelSize = [self subLabelSize];
 
-
         // Adjust for fade length
         CGSize minimumSize = CGSizeMake(minimumLabelSize.width + (self.fadeLength * 2), minimumLabelSize.height);
 
@@ -439,13 +438,8 @@ - (CGSize)subLabelSize {
     CGSize expectedLabelSize = CGSizeZero;
     CGSize maximumLabelSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
 
-    // Calculate based on attributed text
-    expectedLabelSize = [self.subLabel.attributedText boundingRectWithSize:maximumLabelSize
-                                                                   options:NSStringDrawingUsesDeviceMetrics
-                                                                   context:nil].size;
-
-    expectedLabelSize.width = ceilf(expectedLabelSize.width);
-    expectedLabelSize.height = ceilf(self.bounds.size.height);
+    // Get size of subLabel
+    expectedLabelSize = [self.subLabel sizeThatFits:maximumLabelSize];
 
     return expectedLabelSize;
 }