RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-01-14 03:01:15 +00:00
Code Issues Projects Releases Wiki Activity

Refresh main message view for inactive accounts.

Browse Source
This commit is contained in:
John Preston 2020-07-02 13:35:07 +04:00
parent 895c65d518
commit f2577265ee
4 changed files with 11 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/data/data_session.cpp
View File

@ -1279,7 +1279,8 @@ rpl::producer<not_null<ViewElement*>> Session::viewResizeRequest() const {
void Session::requestItemViewRefresh(not_null<HistoryItem*> item) {
if (const auto view = item->mainView()) {
view->setPendingResize();
notifyHistoryChangeDelayed(item->history());
view->refreshInBlock();
}
_itemViewRefreshRequest.fire_copy(item);
}

39
Telegram/SourceFiles/history/history_inner_widget.cpp
View File

@ -178,10 +178,6 @@ HistoryInner::HistoryInner(
) | rpl::start_with_next(
[this](auto view) { viewRemoved(view); },
lifetime());
session().data().itemViewRefreshRequest(
) | rpl::start_with_next(
[this](auto item) { refreshView(item); },
lifetime());
rpl::merge(
session().data().historyUnloaded(),
session().data().historyCleared()
@ -1316,32 +1312,15 @@ void HistoryInner::itemRemoved(not_null<const HistoryItem*> item) {
}
void HistoryInner::viewRemoved(not_null<const Element*> view) {
if (_dragSelFrom == view) {
_dragSelFrom = nullptr;
}
if (_dragSelTo == view) {
_dragSelTo = nullptr;
}
if (_scrollDateLastItem == view) {
_scrollDateLastItem = nullptr;
}
}
void HistoryInner::refreshView(not_null<HistoryItem*> item) {
const auto dragSelFrom = (_dragSelFrom && _dragSelFrom->data() == item);
const auto dragSelTo = (_dragSelTo && _dragSelTo->data() == item);
const auto scrollDateLastItem = (_scrollDateLastItem
&& _scrollDateLastItem->data() == item);
item->refreshMainView();
if (dragSelFrom) {
_dragSelFrom = item->mainView();
}
if (dragSelTo) {
_dragSelTo = item->mainView();
}
if (scrollDateLastItem) {
_scrollDateLastItem = item->mainView();
}
const auto refresh = [&](auto &saved) {
if (saved == view) {
const auto now = view->data()->mainView();
saved = (now && now != view) ? now : nullptr;
}
};
refresh(_dragSelFrom);
refresh(_dragSelTo);
refresh(_scrollDateLastItem);
}
void HistoryInner::mouseActionFinish(

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

@ -239,7 +239,6 @@ private:
void itemRemoved(not_null<const HistoryItem*> item);
void viewRemoved(not_null<const Element*> view);
void refreshView(not_null<HistoryItem*> item);
void touchResetSpeed();
void touchUpdateSpeed();

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

@ -502,15 +502,6 @@ HistoryWidget::HistoryWidget(
}
}, lifetime());
session().data().itemViewRefreshRequest(
) | rpl::start_with_next([=](not_null<HistoryItem*> item) {
// While HistoryInner doesn't own item views we must refresh them
// even if the list is not yet created / was destroyed.
if (!_list) {
item->refreshMainView();
}
}, lifetime());
Core::App().settings().largeEmojiChanges(
) | rpl::start_with_next([=] {
crl::on_main(this, [=] {