signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Refine cell sizing.

Browse Source
This commit is contained in:
Matthew Chen 2018-07-02 12:41:47 -04:00
parent 7be6fbc24f
commit c6f370810b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
View File

@ -1026,7 +1026,6 @@ NS_ASSUME_NONNULL_BEGIN
}
CGFloat hMargins = self.conversationStyle.textInsetHorizontal * 2;
const int maxTextWidth = (int)floor(self.conversationStyle.maxMessageWidth - hMargins);
[self configureBodyTextView];
@ -1042,6 +1041,10 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssert(self.conversationStyle.maxMessageWidth > 0);
CGFloat maxMessageWidth = self.conversationStyle.maxMessageWidth;
if (!self.hasFullWidthMediaView) {
CGFloat hMargins = self.conversationStyle.textInsetHorizontal * 2;
maxMessageWidth -= hMargins;
}
CGSize result = CGSizeZero;
switch (self.cellType) {
@ -1150,7 +1153,7 @@ NS_ASSUME_NONNULL_BEGIN
const int maxTextWidth = (int)floor(self.conversationStyle.maxMessageWidth - hMargins);
[self configureSenderNameLabel];
CGSize result = CGSizeCeil([self.senderNameLabel sizeThatFits:CGSizeMake(maxTextWidth, CGFLOAT_MAX)]);
result.width = MIN(result.width, maxTextWidth);
return [NSValue valueWithCGSize:result];
}
@ -1230,6 +1233,9 @@ NS_ASSUME_NONNULL_BEGIN
cellSize = CGSizeCeil(cellSize);
OWSAssert(cellSize.width <= self.conversationStyle.maxMessageWidth);
cellSize.width = MIN(cellSize.width, self.conversationStyle.maxMessageWidth);
return cellSize;
}