mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-30 16:22:39 +00:00
Console - RoomMember picture: Keep in front typingBadge.
This commit is contained in:
parent
b31c935c7a
commit
a01630ce9a
1 changed files with 6 additions and 0 deletions
|
@ -1737,6 +1737,9 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
|
||||||
memberCell.typingBadge.hidden = YES; //hide typing badge for the current user
|
memberCell.typingBadge.hidden = YES; //hide typing badge for the current user
|
||||||
} else {
|
} else {
|
||||||
memberCell.typingBadge.hidden = ([currentTypingUsers indexOfObject:roomMember.userId] == NSNotFound);
|
memberCell.typingBadge.hidden = ([currentTypingUsers indexOfObject:roomMember.userId] == NSNotFound);
|
||||||
|
if (!memberCell.typingBadge.hidden) {
|
||||||
|
[memberCell.typingBadge.superview bringSubviewToFront:memberCell.typingBadge];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return memberCell;
|
return memberCell;
|
||||||
|
@ -1820,6 +1823,9 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
|
||||||
incomingMsgCell.userNameLabel.text = message.senderName;
|
incomingMsgCell.userNameLabel.text = message.senderName;
|
||||||
// Set typing badge visibility
|
// Set typing badge visibility
|
||||||
incomingMsgCell.typingBadge.hidden = (cell.pictureView.hidden || ([currentTypingUsers indexOfObject:message.senderId] == NSNotFound));
|
incomingMsgCell.typingBadge.hidden = (cell.pictureView.hidden || ([currentTypingUsers indexOfObject:message.senderId] == NSNotFound));
|
||||||
|
if (!incomingMsgCell.typingBadge.hidden) {
|
||||||
|
[incomingMsgCell.typingBadge.superview bringSubviewToFront:incomingMsgCell.typingBadge];
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// Add unsent label for failed components
|
// Add unsent label for failed components
|
||||||
CGFloat yPosition = (message.messageType == RoomMessageTypeText) ? ROOM_MESSAGE_TEXTVIEW_MARGIN : -ROOM_MESSAGE_TEXTVIEW_MARGIN;
|
CGFloat yPosition = (message.messageType == RoomMessageTypeText) ? ROOM_MESSAGE_TEXTVIEW_MARGIN : -ROOM_MESSAGE_TEXTVIEW_MARGIN;
|
||||||
|
|
Loading…
Reference in a new issue