Merge branch 'master' into master-milq

* master: Invalidate intrinsic content size when attributed text changes
TTTAttributedLabel · Jan 30, 2014 · 9c44867 · 9c44867
2 parents 4c82aca + ef4b035
commit 9c44867
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/TTTAttributedLabel/TTTAttributedLabel.m b/TTTAttributedLabel/TTTAttributedLabel.m
@@ -406,6 +406,12 @@ - (void)setAttributedText:(NSAttributedString *)text {
 
     [self setNeedsFramesetter];
     [self setNeedsDisplay];
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 60000
+    if ([self respondsToSelector:@selector(invalidateIntrinsicContentSize)]) {
+        [self invalidateIntrinsicContentSize];
+    }
+#endif
 }
 
 - (void)setNeedsFramesetter {