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

Merge branch 'charlesmchen/quotedMessageOverflow'

Browse Source
This commit is contained in:
Matthew Chen 2018-04-11 13:57:25 -04:00
commit 30943a1c17
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
View File

@ -347,6 +347,7 @@ NS_ASSUME_NONNULL_BEGIN
CGSize quotedAuthorSize
= CGSizeCeil([quotedAuthorLabel sizeThatFits:CGSizeMake(maxQuotedAuthorWidth, CGFLOAT_MAX)]);
quotedAuthorSize.width = MIN(quotedAuthorSize.width, maxQuotedAuthorWidth);
quotedAuthorWidth = quotedAuthorSize.width;
@ -363,6 +364,7 @@ NS_ASSUME_NONNULL_BEGIN
UILabel *quotedTextLabel = [self createQuotedTextLabel];
CGSize textSize = CGSizeCeil([quotedTextLabel sizeThatFits:CGSizeMake(maxQuotedTextWidth, CGFLOAT_MAX)]);
textSize.width = MIN(textSize.width, maxQuotedTextWidth);
quotedTextWidth = textSize.width + self.quotedReplyStripeThickness + self.quotedReplyStripeHSpacing;
result.height += textSize.height + self.quotedReplyStripeVExtension * 2;