Merge branch 'charlesmchen/unreadBadgeRound' into release/2.30.2

pull/1/head
Matthew Chen 7 years ago
commit ea0aba1f99

@ -251,11 +251,12 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssertDebug(UIFont.ows_dynamicTypeBodyFont.pointSize != 17 || minMargin == 12); OWSAssertDebug(UIFont.ows_dynamicTypeBodyFont.pointSize != 17 || minMargin == 12);
[self.viewConstraints addObjectsFromArray:@[ [self.viewConstraints addObjectsFromArray:@[
// badge sizing
[self.unreadBadge autoMatchDimension:ALDimensionWidth [self.unreadBadge autoMatchDimension:ALDimensionWidth
toDimension:ALDimensionWidth toDimension:ALDimensionWidth
ofView:self.unreadLabel ofView:self.unreadLabel
withOffset:minMargin], withOffset:minMargin
// badge sizing relation:NSLayoutRelationGreaterThanOrEqual],
[self.unreadBadge autoSetDimension:ALDimensionWidth [self.unreadBadge autoSetDimension:ALDimensionWidth
toSize:unreadBadgeHeight toSize:unreadBadgeHeight
relation:NSLayoutRelationGreaterThanOrEqual], relation:NSLayoutRelationGreaterThanOrEqual],

Loading…
Cancel
Save