procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix message history stick to bottom. 

Scroll animation should finish when we want to jump to the bottom.
This commit is contained in:
John Preston 2017-05-26 16:06:18 +03:00
parent 10e34aa996
commit e24b0559d3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Telegram/SourceFiles/historywidget.cpp
View File

@ -690,11 +690,12 @@ void HistoryWidget::animatedScrollToY(int scrollTo, HistoryItem *attachTo) {
// Attach our scroll animation to some item. // Attach our scroll animation to some item.
auto itemTop = _list->itemTop(attachTo); auto itemTop = _list->itemTop(attachTo);
auto scrollTop = _scroll->scrollTop();
if (itemTop < 0 && !_history->isEmpty()) { if (itemTop < 0 && !_history->isEmpty()) {
attachTo = _history->blocks.back()->items.back(); attachTo = _history->blocks.back()->items.back();
itemTop = _list->itemTop(attachTo); itemTop = _list->itemTop(attachTo);
} }
if (itemTop < 0) { if (itemTop < 0 || (scrollTop == scrollTo)) {
synteticScrollToY(scrollTo); synteticScrollToY(scrollTo);
return; return;
} }
@ -702,7 +703,6 @@ void HistoryWidget::animatedScrollToY(int scrollTo, HistoryItem *attachTo) {
_scrollToAnimation.finish(); _scrollToAnimation.finish();
auto maxAnimatedDelta = _scroll->height(); auto maxAnimatedDelta = _scroll->height();
auto transition = anim::sineInOut; auto transition = anim::sineInOut;
auto scrollTop = _scroll->scrollTop();
if (scrollTo > scrollTop + maxAnimatedDelta) { if (scrollTo > scrollTop + maxAnimatedDelta) {
scrollTop = scrollTo - maxAnimatedDelta; scrollTop = scrollTo - maxAnimatedDelta;
synteticScrollToY(scrollTop); synteticScrollToY(scrollTop);
@ -4918,7 +4918,7 @@ void HistoryWidget::updateHistoryGeometry(bool initial, bool loadedDown, const S
return; // scrollTopMax etc are not working after recountHeight() return; // scrollTopMax etc are not working after recountHeight()
} }
int newScrollHeight = height() - _topBar->height(); auto newScrollHeight = height() - _topBar->height();
if (isBlocked() || isBotStart() || isJoinChannel() || isMuteUnmute()) { if (isBlocked() || isBotStart() || isJoinChannel() || isMuteUnmute()) {
newScrollHeight -= _unblock->height(); newScrollHeight -= _unblock->height();
} else { } else {
@ -4935,9 +4935,10 @@ void HistoryWidget::updateHistoryGeometry(bool initial, bool loadedDown, const S
if (_pinnedBar) { if (_pinnedBar) {
newScrollHeight -= st::historyReplyHeight; newScrollHeight -= st::historyReplyHeight;
} }
int wasScrollTop = _scroll->scrollTop(); auto wasScrollTop = _scroll->scrollTop();
bool wasAtBottom = wasScrollTop + 1 > _scroll->scrollTopMax(); auto wasScrollTopMax = _scroll->scrollTopMax();
bool needResize = (_scroll->width() != _chatWidth) || (_scroll->height() != newScrollHeight); auto wasAtBottom = wasScrollTop + 1 > wasScrollTopMax;
auto needResize = (_scroll->width() != _chatWidth) || (_scroll->height() != newScrollHeight);
if (needResize) { if (needResize) {
_scroll->resize(_chatWidth, newScrollHeight); _scroll->resize(_chatWidth, newScrollHeight);
// on initial updateListSize we didn't put the _scroll->scrollTop correctly yet // on initial updateListSize we didn't put the _scroll->scrollTop correctly yet
@ -4956,7 +4957,7 @@ void HistoryWidget::updateHistoryGeometry(bool initial, bool loadedDown, const S
_updateHistoryGeometryRequired = false; _updateHistoryGeometryRequired = false;
if ((!initial && !wasAtBottom) || (loadedDown && (!_history->showFrom || _history->unreadBar || _history->loadedAtBottom()) && (!_migrated || !_migrated->showFrom || _migrated->unreadBar || _history->loadedAtBottom()))) { if ((!initial && !wasAtBottom) || (loadedDown && (!_history->showFrom || _history->unreadBar || _history->loadedAtBottom()) && (!_migrated || !_migrated->showFrom || _migrated->unreadBar || _history->loadedAtBottom()))) {
int toY = _list->historyScrollTop(); auto toY = _list->historyScrollTop();
if (change.type == ScrollChangeAdd) { if (change.type == ScrollChangeAdd) {
toY += change.value; toY += change.value;
} else if (change.type == ScrollChangeNoJumpToBottom) { } else if (change.type == ScrollChangeNoJumpToBottom) {
@ -4978,6 +4979,7 @@ void HistoryWidget::updateHistoryGeometry(bool initial, bool loadedDown, const S
if (initial) { if (initial) {
_historyInited = true; _historyInited = true;
_scrollToAnimation.finish();
} }
auto newScrollTop = initial ? countInitialScrollTop() : countAutomaticScrollTop(); auto newScrollTop = initial ? countInitialScrollTop() : countAutomaticScrollTop();
if (_scroll->scrollTop() == newScrollTop) { if (_scroll->scrollTop() == newScrollTop) {