felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-06 07:57:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1921 from vector-im/bf_e2e_padlock_position

Browse Source 
RoomVC: Fix regressions on vertical alignment of e2e padlock, read marker, etc
This commit is contained in:
manuroe
2018-07-03 07:00:22 +02:00
committed by GitHub
parent 344b7ec22b 84154514d0
commit 4703a8ce37
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Model/Room/RoomBubbleCellData.m
+5 -2
View File
@@ -260,6 +260,8 @@ static NSAttributedString *readReceiptVerticalWhitespace = nil;
// Check whether there is at least one component.
if (bubbleComponents.count)
{
BOOL hasReadReceipts = NO;
// Set position of the first component
CGFloat positionY = (self.attachment == nil || self.attachment.type == MXKAttachmentTypeFile || self.attachment.type == MXKAttachmentTypeAudio) ? MXKROOMBUBBLECELLDATA_TEXTVIEW_DEFAULT_VERTICAL_INSET : 0;
MXKRoomBubbleComponent *component;
@@ -273,6 +275,7 @@ static NSAttributedString *readReceiptVerticalWhitespace = nil;
if (component.attributedTextMessage)
{
hasReadReceipts = (self.readReceipts[component.event.eventId].count > 0);
break;
}
}
@@ -297,7 +300,7 @@ static NSAttributedString *readReceiptVerticalWhitespace = nil;
}
// Vertical whitespace is added in case of read receipts
if (self.readReceipts.count)
if (hasReadReceipts)
{
[attributedString appendAttributedString:[RoomBubbleCellData readReceiptVerticalWhitespace]];
}
@@ -337,7 +340,7 @@ static NSAttributedString *readReceiptVerticalWhitespace = nil;
component.position = CGPointMake(0, positionY);
// Add vertical whitespace in case of read receipts.
if (self.readReceipts[component.event.eventId])
if (self.readReceipts[component.event.eventId].count)
{
[attributedString appendAttributedString:[RoomBubbleCellData readReceiptVerticalWhitespace]];
}