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/maxBodyMediaWidth'

Browse Source
This commit is contained in:
Matthew Chen 2019-01-31 15:07:34 -05:00
commit 9ea398afd9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -988,7 +988,10 @@ const UIDataDetectorTypes kOWSAllowedDataDetectorTypes
OWSAssertDebug(self.conversationStyle);
OWSAssertDebug(self.conversationStyle.maxMessageWidth > 0);
CGFloat maxMessageWidth = self.conversationStyle.maxMessageWidth;
// This upper bound should have no effect in portrait orientation.
// It limits body media size in landscape.
const CGFloat kMaxBodyMediaSize = 350;
CGFloat maxMessageWidth = MIN(kMaxBodyMediaSize, self.conversationStyle.maxMessageWidth);
if (!self.hasFullWidthMediaView) {
CGFloat hMargins = self.conversationStyle.textInsetHorizontal * 2;
maxMessageWidth -= hMargins;