From c5d9957be54eaf9a381af13f607269c04e974b13 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Mon, 12 Mar 2018 15:00:56 +0100
Subject: [PATCH] BF: Cannot join from a room preview for room with a long
 topic (#1645)

Topic textview: open it on the top of the topic text
---
 Riot/Views/RoomTitle/PreviewRoomTitleView.m   | 4 ++++
 Riot/Views/RoomTitle/PreviewRoomTitleView.xib | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Riot/Views/RoomTitle/PreviewRoomTitleView.m b/Riot/Views/RoomTitle/PreviewRoomTitleView.m
index d719a1ba05..cc24732969 100644
--- a/Riot/Views/RoomTitle/PreviewRoomTitleView.m
+++ b/Riot/Views/RoomTitle/PreviewRoomTitleView.m
@@ -105,6 +105,10 @@ - (void)refreshDisplay
         
         // Room topic
         self.roomTopic.text = self.roomPreviewData.roomTopic;
+
+        [UIView setAnimationsEnabled:NO];
+        [self.roomTopic scrollRangeToVisible:NSMakeRange(0, 0)];
+        [UIView setAnimationsEnabled:YES];
         
         // Joined members count
         if (self.roomPreviewData.numJoinedMembers > 1)
diff --git a/Riot/Views/RoomTitle/PreviewRoomTitleView.xib b/Riot/Views/RoomTitle/PreviewRoomTitleView.xib
index 5f75dc10bc..31fcca2736 100644
--- a/Riot/Views/RoomTitle/PreviewRoomTitleView.xib
+++ b/Riot/Views/RoomTitle/PreviewRoomTitleView.xib
@@ -47,7 +47,7 @@
                                 <outlet property="delegate" destination="Cpa-Xt-cwB" id="BIq-nD-Pb9"/>
                             </connections>
                         </textField>
-                        <textView opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Room Topic" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Tk0-pA-9a0">
+                        <textView opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" editable="NO" text="Room Topic" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Tk0-pA-9a0">
                             <rect key="frame" x="31" y="153" width="538" height="17"/>
                             <accessibility key="accessibilityConfiguration" identifier="RoomTopic"/>
                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>