From 94e59f5d98e73cb42cc68f49f2ff43cfcbd95d21 Mon Sep 17 00:00:00 2001 From: voanirges Date: Tue, 26 Jun 2018 11:39:38 +0200 Subject: [PATCH] Update UIScrollView+SVPullToRefresh.m --- .../UIScrollView+SVPullToRefresh.m | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/SVPullToRefresh/UIScrollView+SVPullToRefresh.m b/SVPullToRefresh/UIScrollView+SVPullToRefresh.m index ba19078c..1f707cdb 100644 --- a/SVPullToRefresh/UIScrollView+SVPullToRefresh.m +++ b/SVPullToRefresh/UIScrollView+SVPullToRefresh.m @@ -281,14 +281,19 @@ - (void)layoutSubviews { self.subtitleLabel.text = subtitle.length > 0 ? subtitle : nil; - CGSize titleSize = [self.titleLabel.text sizeWithFont:self.titleLabel.font - constrainedToSize:CGSizeMake(labelMaxWidth,self.titleLabel.font.lineHeight) - lineBreakMode:self.titleLabel.lineBreakMode]; + NSMutableParagraphStyle *paragraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy]; + paragraphStyle.lineBreakMode = self.titleLabel.lineBreakMode; - - CGSize subtitleSize = [self.subtitleLabel.text sizeWithFont:self.subtitleLabel.font - constrainedToSize:CGSizeMake(labelMaxWidth,self.subtitleLabel.font.lineHeight) - lineBreakMode:self.subtitleLabel.lineBreakMode]; + CGSize titleSize = [self.titleLabel.text boundingRectWithSize:CGSizeMake(labelMaxWidth,self.titleLabel.font.lineHeight) + options:NSStringDrawingUsesLineFragmentOrigin + attributes:@{NSFontAttributeName: self.titleLabel.font , NSParagraphStyleAttributeName: paragraphStyle} + context:nil].size; + + paragraphStyle.lineBreakMode = self.subtitleLabel.lineBreakMode; + CGSize subtitleSize = [self.subtitleLabel.text boundingRectWithSize:CGSizeMake(labelMaxWidth,self.subtitleLabel.font.lineHeight) + options:NSStringDrawingUsesLineFragmentOrigin + attributes:@{NSFontAttributeName: self.subtitleLabel.font , NSParagraphStyleAttributeName: paragraphStyle} + context:nil].size; CGFloat maxLabelWidth = MAX(titleSize.width,subtitleSize.width);