oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/preserveScrolledToBottom'

This commit is contained in:
Matthew Chen 2017-04-11 17:54:54 -04:00
parent 6bc979cbcd f503d7f93c
commit 61c865a78d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Signal/src/ViewControllers/MessagesViewController.m
View File

@ -2380,7 +2380,6 @@ typedef enum : NSUInteger {
return;
}
__block BOOL scrollToBottom = NO;
const CGFloat kIsAtBottomTolerancePts = 5;
BOOL wasAtBottom = (self.collectionView.contentOffset.y +
self.collectionView.bounds.size.height +
@ -2390,7 +2389,12 @@ typedef enum : NSUInteger {
// update is a new outgoing message AND we're already scrolled to
// the bottom of the conversation, skip the scroll animation.
__block BOOL shouldAnimateScrollToBottom = !wasAtBottom;
// We want to scroll to the bottom if the user:
//
// a) already was at the bottom of the conversation.
// b) is inserting new interactions.
__block BOOL scrollToBottom = wasAtBottom;
[self.collectionView performBatchUpdates:^{
for (YapDatabaseViewRowChange *rowChange in messageRowChanges) {
switch (rowChange.type) {