RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

From above the unread jump to unread by down button.

This commit is contained in:
John Preston 2020-02-20 20:46:56 +04:00
parent f72cb979c0
commit ee8028cd53
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Telegram/SourceFiles/history/history_widget.cpp
View File

@ -1617,6 +1617,18 @@ void HistoryWidget::applyCloudDraft(History *history) {
}
}
bool HistoryWidget::insideJumpToEndInsteadOfToUnread() const {
if (session().supportMode()) {
return true;
} else if (!_historyInited) {
return false;
}
_history->calculateFirstUnreadMessage();
const auto unread = _history->firstUnreadMessage();
const auto visibleBottom = _scroll->scrollTop() + _scroll->height();
return unread && _list->itemTop(unread) <= visibleBottom;
}
void HistoryWidget::showHistory(
const PeerId &peerId,
MsgId showAtMsgId,
@ -1634,9 +1646,15 @@ void HistoryWidget::showHistory(
if (_peer->id == peerId && !reload) {
updateForwarding();
if (showAtMsgId == ShowAtUnreadMsgId) {
if (showAtMsgId == ShowAtUnreadMsgId
&& insideJumpToEndInsteadOfToUnread()) {
showAtMsgId = ShowAtTheEndMsgId;
}
if (!IsServerMsgId(showAtMsgId)
&& !IsServerMsgId(-showAtMsgId)) {
// To end or to unread.
destroyUnreadBar();
}
const auto canShowNow = _history->isReadyFor(showAtMsgId);
if (!canShowNow) {
delayedShowAt(showAtMsgId);
@ -2806,8 +2824,7 @@ void HistoryWidget::historyDownClicked() {
} else if (_replyReturn && _replyReturn->history() == _migrated) {
showHistory(_peer->id, -_replyReturn->id);
} else if (_peer) {
showHistory(_peer->id, ShowAtTheEndMsgId); // #TODO reading
// session().supportMode() ? ShowAtTheEndMsgId : ShowAtUnreadMsgId);
showHistory(_peer->id, ShowAtUnreadMsgId);
}
}
@ -4990,6 +5007,8 @@ int HistoryWidget::countInitialScrollTop() {
createUnreadBarIfBelowVisibleArea(result);
return result;
}
} else if (_showAtMsgId == ShowAtTheEndMsgId) {
return ScrollMax;
} else if (const auto top = unreadBarTop()) {
return *top;
} else {

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

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