@@ -982,35 +982,26 @@ - (CGFloat)heightForTitleLabel
982982
983983- (CGFloat)heightForMessageLabel
984984{
985- CGFloat minHeight = MESSAGE_MIN_LINE_COUNT * self.messageLabel .font .lineHeight ;
986- if (self.messageLabel ) {
987- CGFloat maxHeight = MESSAGE_MAX_LINE_COUNT * self.messageLabel .font .lineHeight ;
988-
989- #ifdef __IPHONE_7_0
990- NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc ] init ];
991- paragraphStyle.lineBreakMode = self.messageLabel .lineBreakMode ;
992-
993- NSDictionary *attributes = @{NSFontAttributeName :self.messageLabel .font ,
994- NSParagraphStyleAttributeName : paragraphStyle.copy };
995-
996- // NSString class method: boundingRectWithSize:options:attributes:context is
997- // available only on ios7.0 sdk.
998- CGRect rect = [self .titleLabel.text boundingRectWithSize: CGSizeMake (CONTAINER_WIDTH - CONTENT_PADDING_LEFT * 2 , maxHeight)
999- options: NSStringDrawingUsesLineFragmentOrigin
1000- attributes: attributes
1001- context: nil ];
1002-
1003- return MAX (minHeight, ceil (rect.size .height ));
1004- #else
1005- CGSize size = [self .message sizeWithFont: self .messageLabel.font
1006- constrainedToSize: CGSizeMake (CONTAINER_WIDTH - CONTENT_PADDING_LEFT * 2 , maxHeight)
1007- lineBreakMode: self .messageLabel.lineBreakMode];
1008-
1009- return MAX (minHeight, size.height );
1010- #endif
1011- }
1012-
1013- return minHeight;
985+ CGFloat minHeight = MESSAGE_MIN_LINE_COUNT * self.messageLabel .font .lineHeight ;
986+ if (self.messageLabel ) {
987+ CGFloat maxHeight = MESSAGE_MAX_LINE_COUNT * self.messageLabel .font .lineHeight ;
988+
989+ #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_7_0
990+ CGRect rect = [self .message boundingRectWithSize: CGSizeMake (CONTAINER_WIDTH - CONTENT_PADDING_LEFT * 2 , maxHeight)
991+ options: NSStringDrawingUsesLineFragmentOrigin
992+ attributes: @{NSFontAttributeName :self.messageLabel .font }
993+ context: nil ];
994+ return MAX (minHeight, ceil (rect.size .height ));
995+ #else
996+ CGSize size = [self .message sizeWithFont: self .messageLabel.font
997+ constrainedToSize: CGSizeMake (CONTAINER_WIDTH - CONTENT_PADDING_LEFT * 2 , maxHeight)
998+ lineBreakMode: self .messageLabel.lineBreakMode];
999+
1000+ return MAX (minHeight, size.height );
1001+ #endif
1002+ }
1003+
1004+ return minHeight;
10141005}
10151006
10161007#pragma mark - Setup
0 commit comments