Skip to content

Commit d702633

Browse files
committed
Merge pull request #152 from forkingdog/pr/104
merge Pr/104
2 parents a854a30 + 9977d01 commit d702633

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

Classes/UITableView+FDTemplateLayoutCell.m

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,13 @@ - (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier configuration:(
9696
} else {
9797
// Add a hard width constraint to make dynamic content views (like labels) expand vertically instead
9898
// of growing horizontally, in a flow-layout manner.
99-
NSLayoutConstraint *tempWidthConstraint = [NSLayoutConstraint constraintWithItem:templateLayoutCell.contentView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:contentViewWidth];
100-
[templateLayoutCell.contentView addConstraint:tempWidthConstraint];
101-
// Auto layout engine does its math
102-
fittingSize = [templateLayoutCell.contentView systemLayoutSizeFittingSize:UILayoutFittingCompressedSize];
103-
[templateLayoutCell.contentView removeConstraint:tempWidthConstraint];
99+
if (contentViewWidth > 0) {
100+
NSLayoutConstraint *widthFenceConstraint = [NSLayoutConstraint constraintWithItem:templateLayoutCell.contentView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:contentViewWidth];
101+
[templateLayoutCell.contentView addConstraint:widthFenceConstraint];
102+
// Auto layout engine does its math
103+
fittingSize = [templateLayoutCell.contentView systemLayoutSizeFittingSize:UILayoutFittingCompressedSize];
104+
[templateLayoutCell.contentView removeConstraint:widthFenceConstraint];
105+
}
104106
}
105107

106108
// Add separator's height, using a private property in UITableViewCell.

0 commit comments

Comments
 (0)