Merge pull request Tencent#228 from wanhmr/master

Fixed 当使用 xib / storyboard 时，button 和 label 的大小展示错误
iGitHubMaster · Nov 9, 2017 · ca92e3b · ca92e3b
2 parents 6782c71 + 75d1e1d
commit ca92e3b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/QMUIKit/QMUIComponents/QMUIButton.m b/QMUIKit/QMUIComponents/QMUIButton.m
@@ -128,6 +128,10 @@ - (CGSize)sizeThatFits:(CGSize)size {
     return resultSize;
 }
 
+- (CGSize)intrinsicContentSize {
+    return [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
+}
+
 - (void)layoutSubviews {
     [super layoutSubviews];
 

diff --git a/QMUIKit/QMUIComponents/QMUILabel.m b/QMUIKit/QMUIComponents/QMUILabel.m
@@ -34,6 +34,14 @@ - (CGSize)sizeThatFits:(CGSize)size {
     return size;
 }
 
+- (CGSize)intrinsicContentSize {
+    CGFloat preferredMaxLayoutWidth = self.preferredMaxLayoutWidth;
+    if (preferredMaxLayoutWidth <= 0) {
+        preferredMaxLayoutWidth = CGFLOAT_MAX;
+    }
+    return [self sizeThatFits:CGSizeMake(preferredMaxLayoutWidth, CGFLOAT_MAX)];
+}
+
 - (void)drawTextInRect:(CGRect)rect {
     return [super drawTextInRect:UIEdgeInsetsInsetRect(rect, self.contentEdgeInsets)];
 }