void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-16 22:27:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't jump above pinned chats.

Browse source 
Fixes #6802.
This commit is contained in:
John Preston 2022-10-06 19:11:00 +04:00
parent 24d3bcb590
commit 377b86372b
3 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
View file

@ -123,7 +123,7 @@ public:
[[nodiscard]] MsgId lastSearchMigratedId() const;
[[nodiscard]] WidgetState state() const;
[[nodiscard]] const style::DialogRow *st() const {
[[nodiscard]] not_null<const style::DialogRow*> st() const {
return _st;
}
[[nodiscard]] bool waitingForSearch() const {

37
Telegram/SourceFiles/dialogs/dialogs_widget.cpp
View file

@ -208,8 +208,19 @@ Widget::Widget(
session().changes().historyUpdates(
Data::HistoryUpdate::Flag::MessageSent
) | rpl::start_with_next([=] {
jumpToTop();
) | rpl::filter([=](const Data::HistoryUpdate &update) {
if (_openedForum) {
return (update.history->peer == _openedForum);
} else if (_openedFolder) {
return (update.history->folder() == _openedFolder)
&& !update.history->isPinnedDialog(FilterId());
} else {
return !update.history->folder()
&& !update.history->isPinnedDialog(
controller->activeChatsFilterCurrent());
}
}) | rpl::start_with_next([=](const Data::HistoryUpdate &update) {
jumpToTop(true);
}, lifetime());
fullSearchRefreshOn(session().settings().skipArchiveInSearchChanges(
@ -764,13 +775,31 @@ void Widget::setInnerFocus() {
}
}
void Widget::jumpToTop() {
void Widget::jumpToTop(bool belowPinned) {
if (session().supportMode()) {
return;
}
if ((_filter->getLastText().trimmed().isEmpty() && !_searchInChat)) {
auto to = 0;
if (belowPinned) {
const auto list = _openedForum
? _openedForum->forum()->topicsList()
: controller()->activeChatsFilterCurrent()
? session().data().chatsFilters().chatsList(
controller()->activeChatsFilterCurrent())
: session().data().chatsList(_openedFolder);
const auto count = int(list->pinned()->order().size());
const auto now = _scroll->scrollTop();
const auto row = _inner->st()->height;
const auto min = (row * (count * 2 + 1) - _scroll->height()) / 2;
if (_scroll->scrollTop() <= min) {
return;
}
// Don't jump too high up, below the pinned chats.
to = std::max(min, to);
}
_scrollToAnimation.stop();
_scroll->scrollToY(0);
_scroll->scrollToY(to);
}
}

2
Telegram/SourceFiles/dialogs/dialogs_widget.h
View file

@ -70,7 +70,7 @@ public:
void searchInChat(Key chat);
void setInnerFocus();
void jumpToTop();
void jumpToTop(bool belowPinned = false);
void startWidthAnimation();
void stopWidthAnimation();