From a01630ce9ad239026cb917b269cbcc6a6b11b4fa Mon Sep 17 00:00:00 2001
From: giomfo <giom@matrix.org>
Date: Fri, 30 Jan 2015 19:14:59 +0100
Subject: [PATCH] Console - RoomMember picture: Keep in front typingBadge.

---
 matrixConsole/ViewController/RoomViewController.m | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/matrixConsole/ViewController/RoomViewController.m b/matrixConsole/ViewController/RoomViewController.m
index 12fbd96da..814f91367 100644
--- a/matrixConsole/ViewController/RoomViewController.m
+++ b/matrixConsole/ViewController/RoomViewController.m
@@ -1737,6 +1737,9 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
                 memberCell.typingBadge.hidden = YES; //hide typing badge for the current user
             } else {
                 memberCell.typingBadge.hidden = ([currentTypingUsers indexOfObject:roomMember.userId] == NSNotFound);
+                if (!memberCell.typingBadge.hidden) {
+                    [memberCell.typingBadge.superview bringSubviewToFront:memberCell.typingBadge];
+                }
             }
         }
         return memberCell;
@@ -1820,6 +1823,9 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
         incomingMsgCell.userNameLabel.text = message.senderName;
         // Set typing badge visibility
         incomingMsgCell.typingBadge.hidden = (cell.pictureView.hidden || ([currentTypingUsers indexOfObject:message.senderId] == NSNotFound));
+        if (!incomingMsgCell.typingBadge.hidden) {
+            [incomingMsgCell.typingBadge.superview bringSubviewToFront:incomingMsgCell.typingBadge];
+        }
     } else {
         // Add unsent label for failed components
         CGFloat yPosition = (message.messageType == RoomMessageTypeText) ? ROOM_MESSAGE_TEXTVIEW_MARGIN : -ROOM_MESSAGE_TEXTVIEW_MARGIN;