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
element-hq · Mar 12, 2018 · c5d9957 · c5d9957
1 parent 3df7e19
commit c5d9957
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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"/>