procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fix scroll first to unread then to end.

Browse source
This commit is contained in:
John Preston 2020-02-21 10:37:57 +04:00
parent ee8028cd53
commit f133210db3
2 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -796,6 +796,7 @@ void HistoryWidget::scrollToCurrentVoiceMessage(FullMsgId fromId, FullMsgId toId
void HistoryWidget::animatedScrollToItem(MsgId msgId) {
Expects(_history != nullptr);
if (hasPendingResizedItems()) {
updateListSize();
}
@ -814,6 +815,7 @@ void HistoryWidget::animatedScrollToItem(MsgId msgId) {
void HistoryWidget::animatedScrollToY(int scrollTo, HistoryItem *attachTo) {
Expects(_history != nullptr);
if (hasPendingResizedItems()) {
updateListSize();
}
@ -1677,13 +1679,11 @@ void HistoryWidget::showHistory(
setMsgId(showAtMsgId);
if (_historyInited) {
const auto to = countInitialScrollTop();
const auto item = getItemFromHistoryOrMigrated(
_showAtMsgId);
animatedScrollToY(
std::clamp(
countInitialScrollTop(),
0,
_scroll->scrollTopMax()),
std::clamp(to, 0, _scroll->scrollTopMax()),
item);
} else {
historyLoaded();
@ -2655,7 +2655,10 @@ void HistoryWidget::loadMessagesDown() {
}
void HistoryWidget::delayedShowAt(MsgId showAtMsgId) {
if (!_history || (_delayedShowAtRequest && _delayedShowAtMsgId == showAtMsgId)) return;
if (!_history
|| (_delayedShowAtRequest && _delayedShowAtMsgId == showAtMsgId)) {
return;
}
clearDelayedShowAt();
_delayedShowAtMsgId = showAtMsgId;
@ -5024,14 +5027,23 @@ void HistoryWidget::createUnreadBarIfBelowVisibleArea(int withScrollTop) {
_history->calculateFirstUnreadMessage();
if (const auto unread = _history->firstUnreadMessage()) {
if (_list->itemTop(unread) > withScrollTop) {
_history->addUnreadBar();
if (hasPendingResizedItems()) {
updateListSize();
}
createUnreadBarAndResize();
}
}
}
void HistoryWidget::createUnreadBarAndResize() {
if (!_history->firstUnreadMessage()) {
return;
}
const auto was = base::take(_historyInited);
_history->addUnreadBar();
if (hasPendingResizedItems()) {
updateListSize();
}
_historyInited = was;
}
int HistoryWidget::countAutomaticScrollTop() {
Expects(_history != nullptr);
Expects(_list != nullptr);
@ -5042,12 +5054,8 @@ int HistoryWidget::countAutomaticScrollTop() {
+ HistoryView::UnreadBar::height()
- HistoryView::UnreadBar::marginTop();
if (firstUnreadTop < possibleUnreadBarTop) {
const auto history = unread->data()->history();
history->addUnreadBar();
if (hasPendingResizedItems()) {
updateListSize();
}
if (history->unreadBar() != nullptr) {
createUnreadBarAndResize();
if (_history->unreadBar() != nullptr) {
setMsgId(ShowAtUnreadMsgId);
return countInitialScrollTop();
}
@ -5213,9 +5221,7 @@ void HistoryWidget::addMessagesToBack(
_list->messagesReceivedDown(peer, messages);
if (checkForUnreadStart) {
_history->calculateFirstUnreadMessage();
if (const auto unread = _history->firstUnreadMessage()) {
_history->addUnreadBar();
}
createUnreadBarAndResize();
}
if (!_firstLoadRequest) {
updateHistoryGeometry(false, true, { ScrollChangeNoJumpToBottom, 0 });

1
Telegram/SourceFiles/history/history_widget.h
View file

@ -560,6 +560,7 @@ private:
void destroyUnreadBarOnClose();
void createUnreadBarIfBelowVisibleArea(int withScrollTop);
[[nodiscard]] bool insideJumpToEndInsteadOfToUnread() const;
void createUnreadBarAndResize();
void saveEditMsg();
void saveEditMsgDone(History *history, const MTPUpdates &updates, mtpRequestId req);