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

Handle view resize/repaint requests for mainView.

This commit is contained in:
John Preston 2018-01-18 14:46:45 +03:00
parent d1a9d3992b
commit 91f369a0b3
19 changed files with 121 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/apiwrap.cpp
View File

@ -1785,7 +1785,7 @@ void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &msgs
v->at(index), v->at(index),
NewMessageExisting); NewMessageExisting);
if (item) { if (item) {
_session->data().requestItemViewResize(item); _session->data().requestItemResize(item);
} }
} }
@ -2137,7 +2137,7 @@ void ApiWrap::applyUpdateNoPtsCheck(const MTPUpdate &update) {
if (auto item = App::histItemById(NoChannel, msgId.v)) { if (auto item = App::histItemById(NoChannel, msgId.v)) {
if (item->isMediaUnread()) { if (item->isMediaUnread()) {
item->markMediaRead(); item->markMediaRead();
_session->data().requestItemViewRepaint(item); _session->data().requestItemRepaint(item);
if (item->out() && item->history()->peer->isUser()) { if (item->out() && item->history()->peer->isUser()) {
auto when = App::main()->requestingDifference() ? 0 : unixtime(); auto when = App::main()->requestingDifference() ? 0 : unixtime();
@ -3134,7 +3134,7 @@ void ApiWrap::sendMediaWithRandomId(
| (IsSilentPost(item, silent) | (IsSilentPost(item, silent)
? MTPmessages_SendMedia::Flag::f_silent ? MTPmessages_SendMedia::Flag::f_silent
: MTPmessages_SendMedia::Flag(0)); : MTPmessages_SendMedia::Flag(0));
const auto message = QString(); // #TODO l76 const auto message = QString(); // #TODO l76 caption
history->sendRequestId = request(MTPmessages_SendMedia( history->sendRequestId = request(MTPmessages_SendMedia(
MTP_flags(flags), MTP_flags(flags),
history->peer->input, history->peer->input,

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

@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "observer_peer.h" #include "observer_peer.h"
#include "auth_session.h" #include "auth_session.h"
#include "apiwrap.h" #include "apiwrap.h"
#include "history/history.h"
#include "history/history_item_components.h" #include "history/history_item_components.h"
#include "history/history_media.h" #include "history/history_media.h"
#include "history/view/history_view_element.h" #include "history/view/history_view_element.h"
@ -74,7 +75,7 @@ Session::~Session() = default;
template <typename Method> template <typename Method>
void Session::enumerateItemViews( void Session::enumerateItemViews(
not_null<HistoryItem*> item, not_null<const HistoryItem*> item,
Method method) { Method method) {
if (const auto i = _views.find(item); i != _views.end()) { if (const auto i = _views.find(item); i != _views.end()) {
for (const auto view : i->second) { for (const auto view : i->second) {
@ -166,12 +167,15 @@ rpl::producer<Session::IdChange> Session::itemIdChanged() const {
return _itemIdChanges.events(); return _itemIdChanges.events();
} }
void Session::requestItemViewRepaint(not_null<const HistoryItem*> item) { void Session::requestItemRepaint(not_null<const HistoryItem*> item) {
_itemViewRepaintRequest.fire_copy(item); _itemRepaintRequest.fire_copy(item);
enumerateItemViews(item, [&](not_null<const ViewElement*> view) {
requestViewRepaint(view);
});
} }
rpl::producer<not_null<const HistoryItem*>> Session::itemViewRepaintRequest() const { rpl::producer<not_null<const HistoryItem*>> Session::itemRepaintRequest() const {
return _itemViewRepaintRequest.events(); return _itemRepaintRequest.events();
} }
void Session::requestViewRepaint(not_null<const ViewElement*> view) { void Session::requestViewRepaint(not_null<const ViewElement*> view) {
@ -182,23 +186,32 @@ rpl::producer<not_null<const ViewElement*>> Session::viewRepaintRequest() const
return _viewRepaintRequest.events(); return _viewRepaintRequest.events();
} }
void Session::requestItemViewResize(not_null<const HistoryItem*> item) { void Session::requestItemResize(not_null<const HistoryItem*> item) {
_itemViewResizeRequest.fire_copy(item); _itemResizeRequest.fire_copy(item);
enumerateItemViews(item, [&](not_null<ViewElement*> view) {
requestViewResize(view);
});
} }
rpl::producer<not_null<const HistoryItem*>> Session::itemViewResizeRequest() const { rpl::producer<not_null<const HistoryItem*>> Session::itemResizeRequest() const {
return _itemViewResizeRequest.events(); return _itemResizeRequest.events();
} }
void Session::requestViewResize(not_null<const ViewElement*> view) { void Session::requestViewResize(not_null<ViewElement*> view) {
if (view == view->data()->mainView()) {
view->setPendingResize();
}
_viewResizeRequest.fire_copy(view); _viewResizeRequest.fire_copy(view);
} }
rpl::producer<not_null<const ViewElement*>> Session::viewResizeRequest() const { rpl::producer<not_null<ViewElement*>> Session::viewResizeRequest() const {
return _viewResizeRequest.events(); return _viewResizeRequest.events();
} }
void Session::requestItemViewRefresh(not_null<const HistoryItem*> item) { void Session::requestItemViewRefresh(not_null<const HistoryItem*> item) {
if (const auto view = item->mainView()) {
view->setPendingResize();
}
_itemViewRefreshRequest.fire_copy(item); _itemViewRefreshRequest.fire_copy(item);
} }
@ -238,11 +251,12 @@ rpl::producer<not_null<const History*>> Session::historyCleared() const {
return _historyCleared.events(); return _historyCleared.events();
} }
void Session::notifyHistoryChangeDelayed(not_null<const History*> history) { void Session::notifyHistoryChangeDelayed(not_null<History*> history) {
_historiesChanged.insert(history); _historiesChanged.insert(history);
history->setPendingResize();
} }
rpl::producer<not_null<const History*>> Session::historyChanged() const { rpl::producer<not_null<History*>> Session::historyChanged() const {
return _historyChanged.events(); return _historyChanged.events();
} }

32
Telegram/SourceFiles/data/data_session.h
View File

@ -65,14 +65,14 @@ public:
rpl::producer<IdChange> itemIdChanged() const; rpl::producer<IdChange> itemIdChanged() const;
void notifyViewLayoutChange(not_null<const ViewElement*> view); void notifyViewLayoutChange(not_null<const ViewElement*> view);
rpl::producer<not_null<const ViewElement*>> viewLayoutChanged() const; rpl::producer<not_null<const ViewElement*>> viewLayoutChanged() const;
void requestItemViewRepaint(not_null<const HistoryItem*> item); void requestItemRepaint(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemViewRepaintRequest() const; rpl::producer<not_null<const HistoryItem*>> itemRepaintRequest() const;
void requestViewRepaint(not_null<const ViewElement*> view); void requestViewRepaint(not_null<const ViewElement*> view);
rpl::producer<not_null<const ViewElement*>> viewRepaintRequest() const; rpl::producer<not_null<const ViewElement*>> viewRepaintRequest() const;
void requestItemViewResize(not_null<const HistoryItem*> item); void requestItemResize(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemViewResizeRequest() const; rpl::producer<not_null<const HistoryItem*>> itemResizeRequest() const;
void requestViewResize(not_null<const ViewElement*> view); void requestViewResize(not_null<ViewElement*> view);
rpl::producer<not_null<const ViewElement*>> viewResizeRequest() const; rpl::producer<not_null<ViewElement*>> viewResizeRequest() const;
void requestItemViewRefresh(not_null<const HistoryItem*> item); void requestItemViewRefresh(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemViewRefreshRequest() const; rpl::producer<not_null<const HistoryItem*>> itemViewRefreshRequest() const;
void requestItemPlayInline(not_null<const HistoryItem*> item); void requestItemPlayInline(not_null<const HistoryItem*> item);
@ -84,8 +84,8 @@ public:
rpl::producer<not_null<const HistoryItem*>> itemRemoved() const; rpl::producer<not_null<const HistoryItem*>> itemRemoved() const;
void notifyHistoryCleared(not_null<const History*> history); void notifyHistoryCleared(not_null<const History*> history);
rpl::producer<not_null<const History*>> historyCleared() const; rpl::producer<not_null<const History*>> historyCleared() const;
void notifyHistoryChangeDelayed(not_null<const History*> history); void notifyHistoryChangeDelayed(not_null<History*> history);
rpl::producer<not_null<const History*>> historyChanged() const; rpl::producer<not_null<History*>> historyChanged() const;
void sendHistoryChangeNotifications(); void sendHistoryChangeNotifications();
using MegagroupParticipant = std::tuple< using MegagroupParticipant = std::tuple<
@ -431,7 +431,9 @@ private:
void setIsPinned(const Dialogs::Key &key, bool pinned); void setIsPinned(const Dialogs::Key &key, bool pinned);
template <typename Method> template <typename Method>
void enumerateItemViews(not_null<HistoryItem*> item, Method method); void enumerateItemViews(
not_null<const HistoryItem*> item,
Method method);
not_null<AuthSession*> _session; not_null<AuthSession*> _session;
@ -442,17 +444,17 @@ private:
base::Observable<ItemVisibilityQuery> _queryItemVisibility; base::Observable<ItemVisibilityQuery> _queryItemVisibility;
rpl::event_stream<IdChange> _itemIdChanges; rpl::event_stream<IdChange> _itemIdChanges;
rpl::event_stream<not_null<const ViewElement*>> _viewLayoutChanges; rpl::event_stream<not_null<const ViewElement*>> _viewLayoutChanges;
rpl::event_stream<not_null<const HistoryItem*>> _itemViewRepaintRequest; rpl::event_stream<not_null<const HistoryItem*>> _itemRepaintRequest;
rpl::event_stream<not_null<const ViewElement*>> _viewRepaintRequest; rpl::event_stream<not_null<const ViewElement*>> _viewRepaintRequest;
rpl::event_stream<not_null<const HistoryItem*>> _itemViewResizeRequest; rpl::event_stream<not_null<const HistoryItem*>> _itemResizeRequest;
rpl::event_stream<not_null<const ViewElement*>> _viewResizeRequest; rpl::event_stream<not_null<ViewElement*>> _viewResizeRequest;
rpl::event_stream<not_null<const HistoryItem*>> _itemViewRefreshRequest; rpl::event_stream<not_null<const HistoryItem*>> _itemViewRefreshRequest;
rpl::event_stream<not_null<const HistoryItem*>> _itemPlayInlineRequest; rpl::event_stream<not_null<const HistoryItem*>> _itemPlayInlineRequest;
rpl::event_stream<not_null<const HistoryItem*>> _itemRemoved; rpl::event_stream<not_null<const HistoryItem*>> _itemRemoved;
rpl::event_stream<not_null<const History*>> _historyUnloaded; rpl::event_stream<not_null<const History*>> _historyUnloaded;
rpl::event_stream<not_null<const History*>> _historyCleared; rpl::event_stream<not_null<const History*>> _historyCleared;
base::flat_set<not_null<const History*>> _historiesChanged; base::flat_set<not_null<History*>> _historiesChanged;
rpl::event_stream<not_null<const History*>> _historyChanged; rpl::event_stream<not_null<History*>> _historyChanged;
rpl::event_stream<MegagroupParticipant> _megagroupParticipantRemoved; rpl::event_stream<MegagroupParticipant> _megagroupParticipantRemoved;
rpl::event_stream<MegagroupParticipant> _megagroupParticipantAdded; rpl::event_stream<MegagroupParticipant> _megagroupParticipantAdded;
@ -517,7 +519,7 @@ private:
base::flat_map<FeedId, std::unique_ptr<Data::Feed>> _feeds; base::flat_map<FeedId, std::unique_ptr<Data::Feed>> _feeds;
Groups _groups; Groups _groups;
std::map< std::map<
not_null<HistoryItem*>, not_null<const HistoryItem*>,
std::vector<not_null<ViewElement*>>> _views; std::vector<not_null<ViewElement*>>> _views;
MessageIdsList _mimeForwardIds; MessageIdsList _mimeForwardIds;

2
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View File

@ -94,7 +94,7 @@ DialogsInner::DialogsInner(QWidget *parent, not_null<Window::Controller*> contro
) | rpl::start_with_next( ) | rpl::start_with_next(
[this](auto item) { itemRemoved(item); }, [this](auto item) { itemRemoved(item); },
lifetime()); lifetime());
Auth().data().itemViewRepaintRequest( Auth().data().itemRepaintRequest(
) | rpl::start_with_next([this](auto item) { ) | rpl::start_with_next([this](auto item) {
const auto history = item->history(); const auto history = item->history();
if (history->textCachedFor == item) { if (history->textCachedFor == item) {

2
Telegram/SourceFiles/facades.cpp
View File

@ -350,7 +350,7 @@ void handlePendingHistoryUpdate() {
Auth().data().pendingHistoryResize().notify(true); Auth().data().pendingHistoryResize().notify(true);
//for (const auto item : base::take(Global::RefPendingRepaintItems())) { //for (const auto item : base::take(Global::RefPendingRepaintItems())) {
// Auth().data().requestItemViewRepaint(item); // Auth().data().requestItemRepaint(item);
// Start the video if it is waiting for that. // Start the video if it is waiting for that.
//if (item->pendingInitDimensions()) { // #TODO floating player video //if (item->pendingInitDimensions()) { // #TODO floating player video

8
Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp
View File

@ -213,11 +213,9 @@ InnerWidget::InnerWidget(
, _emptyText(st::historyAdminLogEmptyWidth - st::historyAdminLogEmptyPadding.left() - st::historyAdminLogEmptyPadding.left()) { , _emptyText(st::historyAdminLogEmptyWidth - st::historyAdminLogEmptyPadding.left() - st::historyAdminLogEmptyPadding.left()) {
setMouseTracking(true); setMouseTracking(true);
_scrollDateHideTimer.setCallback([this] { scrollDateHideByTimer(); }); _scrollDateHideTimer.setCallback([this] { scrollDateHideByTimer(); });
Auth().data().itemViewRepaintRequest( Auth().data().viewRepaintRequest(
) | rpl::start_with_next([this](auto item) { ) | rpl::start_with_next([this](auto view) {
if (item->isLogEntry() && _history == item->history()) { repaintItem(view); // #TODO check my view
repaintItem(viewForItem(item));
}
}, lifetime()); }, lifetime());
subscribe(Auth().data().pendingHistoryResize(), [this] { handlePendingHistoryResize(); }); subscribe(Auth().data().pendingHistoryResize(), [this] { handlePendingHistoryResize(); });
subscribe(Auth().data().queryItemVisibility(), [this](const Data::Session::ItemVisibilityQuery &query) { subscribe(Auth().data().queryItemVisibility(), [this](const Data::Session::ItemVisibilityQuery &query) {

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

@ -164,6 +164,10 @@ HistoryInner::HistoryInner(
}) | rpl::start_with_next([this] { }) | rpl::start_with_next([this] {
mouseActionCancel(); mouseActionCancel();
}, lifetime()); }, lifetime());
Auth().data().viewRepaintRequest(
) | rpl::start_with_next(
[this](auto view) { repaintItem(view); },
lifetime());
} }
void HistoryInner::messagesReceived(PeerData *peer, const QVector<MTPMessage> &messages) { void HistoryInner::messagesReceived(PeerData *peer, const QVector<MTPMessage> &messages) {
@ -191,17 +195,19 @@ void HistoryInner::messagesReceivedDown(PeerData *peer, const QVector<MTPMessage
} }
void HistoryInner::repaintItem(const HistoryItem *item) { void HistoryInner::repaintItem(const HistoryItem *item) {
if (item) { if (!item) {
repaintItem(item->mainView()); return;
} }
repaintItem(item->mainView());
} }
void HistoryInner::repaintItem(const Element *view) { void HistoryInner::repaintItem(const Element *view) {
if (view) { if (_widget->skipItemRepaint()) {
const auto top = itemTop(view); return;
if (top >= 0) { }
update(0, top, width(), view->height()); const auto top = itemTop(view);
} if (top >= 0) {
update(0, top, width(), view->height());
} }
} }

8
Telegram/SourceFiles/history/history_item.cpp
View File

@ -339,7 +339,7 @@ void HistoryItem::setRealId(MsgId newId) {
} }
Auth().data().notifyItemIdChange({ this, oldId }); Auth().data().notifyItemIdChange({ this, oldId });
Auth().data().requestItemViewRepaint(this); Auth().data().requestItemRepaint(this);
} }
bool HistoryItem::isPinned() const { bool HistoryItem::isPinned() const {
@ -573,7 +573,7 @@ void HistoryItem::destroyUnreadBar() {
Assert(!isLogEntry()); Assert(!isLogEntry());
RemoveComponents(HistoryMessageUnreadBar::Bit()); RemoveComponents(HistoryMessageUnreadBar::Bit());
Auth().data().requestItemViewResize(this); Auth().data().requestItemResize(this);
if (_history->unreadBar == this) { if (_history->unreadBar == this) {
_history->unreadBar = nullptr; _history->unreadBar = nullptr;
} }
@ -587,7 +587,7 @@ void HistoryItem::setUnreadBarCount(int count) {
if (count > 0) { if (count > 0) {
if (!Has<HistoryMessageUnreadBar>()) { if (!Has<HistoryMessageUnreadBar>()) {
AddComponents(HistoryMessageUnreadBar::Bit()); AddComponents(HistoryMessageUnreadBar::Bit());
Auth().data().requestItemViewResize(this); Auth().data().requestItemResize(this);
// #TODO recount attach to previous // #TODO recount attach to previous
} }
const auto bar = Get<HistoryMessageUnreadBar>(); const auto bar = Get<HistoryMessageUnreadBar>();
@ -595,7 +595,7 @@ void HistoryItem::setUnreadBarCount(int count) {
return; return;
} }
bar->init(count); bar->init(count);
Auth().data().requestItemViewRepaint(this); Auth().data().requestItemRepaint(this);
} else { } else {
destroyUnreadBar(); destroyUnreadBar();
} }

4
Telegram/SourceFiles/history/history_item_components.cpp
View File

@ -163,7 +163,7 @@ bool HistoryMessageReply::updateData(HistoryMessage *holder, bool force) {
replyToMsgId = 0; replyToMsgId = 0;
} }
if (force) { if (force) {
Auth().data().requestItemViewResize(holder); Auth().data().requestItemResize(holder);
} }
return (replyToMsg || !replyToMsgId); return (replyToMsg || !replyToMsgId);
} }
@ -219,7 +219,7 @@ void HistoryMessageReply::itemRemoved(
HistoryItem *removed) { HistoryItem *removed) {
if (replyToMsg == removed) { if (replyToMsg == removed) {
clearData(holder); clearData(holder);
Auth().data().requestItemViewResize(holder); Auth().data().requestItemResize(holder);
} }
} }

16
Telegram/SourceFiles/history/history_message.cpp
View File

@ -552,7 +552,7 @@ void HistoryMessage::applyGroupAdminChanges(
} else { } else {
_flags &= ~MTPDmessage_ClientFlag::f_has_admin_badge; _flags &= ~MTPDmessage_ClientFlag::f_has_admin_badge;
} }
Auth().data().requestItemViewResize(this); Auth().data().requestItemResize(this);
} }
} }
@ -908,7 +908,7 @@ void HistoryMessage::updateSentMedia(const MTPMessageMedia *media) {
refreshMedia(media); refreshMedia(media);
} }
} }
Auth().data().requestItemViewResize(this); Auth().data().requestItemResize(this);
} }
void HistoryMessage::addToUnreadMentions(UnreadMentionType type) { void HistoryMessage::addToUnreadMentions(UnreadMentionType type) {
@ -1003,7 +1003,7 @@ void HistoryMessage::setReplyMarkup(const MTPReplyMarkup *markup) {
if (Has<HistoryMessageReplyMarkup>()) { if (Has<HistoryMessageReplyMarkup>()) {
RemoveComponents(HistoryMessageReplyMarkup::Bit()); RemoveComponents(HistoryMessageReplyMarkup::Bit());
} }
Auth().data().requestItemViewResize(this); Auth().data().requestItemResize(this);
Notify::replyMarkupUpdated(this); Notify::replyMarkupUpdated(this);
} }
return; return;
@ -1022,7 +1022,7 @@ void HistoryMessage::setReplyMarkup(const MTPReplyMarkup *markup) {
changed = true; changed = true;
} }
if (changed) { if (changed) {
Auth().data().requestItemViewResize(this); Auth().data().requestItemResize(this);
Notify::replyMarkupUpdated(this); Notify::replyMarkupUpdated(this);
} }
} else { } else {
@ -1033,7 +1033,7 @@ void HistoryMessage::setReplyMarkup(const MTPReplyMarkup *markup) {
AddComponents(HistoryMessageReplyMarkup::Bit()); AddComponents(HistoryMessageReplyMarkup::Bit());
} }
Get<HistoryMessageReplyMarkup>()->create(*markup); Get<HistoryMessageReplyMarkup>()->create(*markup);
Auth().data().requestItemViewResize(this); Auth().data().requestItemResize(this);
Notify::replyMarkupUpdated(this); Notify::replyMarkupUpdated(this);
} }
} }
@ -1066,16 +1066,16 @@ void HistoryMessage::setViewsCount(int32 count) {
? 0 ? 0
: st::msgDateFont->width(views->_viewsText); : st::msgDateFont->width(views->_viewsText);
if (was == views->_viewsWidth) { if (was == views->_viewsWidth) {
Auth().data().requestItemViewRepaint(this); Auth().data().requestItemRepaint(this);
} else { } else {
Auth().data().requestItemViewResize(this); Auth().data().requestItemResize(this);
} }
} }
void HistoryMessage::setRealId(MsgId newId) { void HistoryMessage::setRealId(MsgId newId) {
HistoryItem::setRealId(newId); HistoryItem::setRealId(newId);
Auth().data().groups().refreshMessage(this); Auth().data().groups().refreshMessage(this);
Auth().data().requestItemViewResize(this); Auth().data().requestItemResize(this);
} }
void HistoryMessage::dependencyItemRemoved(HistoryItem *dependency) { void HistoryMessage::dependencyItemRemoved(HistoryItem *dependency) {

4
Telegram/SourceFiles/history/history_service.cpp
View File

@ -588,7 +588,7 @@ void HistoryService::removeMedia() {
_media.reset(); _media.reset();
_textWidth = -1; _textWidth = -1;
_textHeight = 0; _textHeight = 0;
Auth().data().requestItemViewResize(this); Auth().data().requestItemResize(this);
} }
Storage::SharedMediaTypesMask HistoryService::sharedMediaTypes() const { Storage::SharedMediaTypesMask HistoryService::sharedMediaTypes() const {
@ -611,7 +611,7 @@ void HistoryService::updateDependentText() {
} }
setServiceText(text); setServiceText(text);
Auth().data().requestItemViewResize(this); Auth().data().requestItemResize(this);
if (history()->textCachedFor == this) { if (history()->textCachedFor == this) {
history()->textCachedFor = nullptr; history()->textCachedFor = nullptr;
} }

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

@ -559,14 +559,22 @@ HistoryWidget::HistoryWidget(QWidget *parent, not_null<Window::Controller*> cont
) | rpl::start_with_next( ) | rpl::start_with_next(
[this](auto item) { itemRemoved(item); }, [this](auto item) { itemRemoved(item); },
lifetime()); lifetime());
Auth().data().itemViewRepaintRequest(
) | rpl::start_with_next(
[this](auto item) { repaintHistoryItem(item); },
lifetime());
Auth().data().historyChanged( Auth().data().historyChanged(
) | rpl::start_with_next( ) | rpl::start_with_next(
[=](auto history) { handleHistoryChange(history); }, [=](auto history) { handleHistoryChange(history); },
lifetime()); lifetime());
Auth().data().viewResizeRequest(
) | rpl::start_with_next([this](auto view) {
if (view->data()->mainView() == view) {
updateHistoryGeometry();
}
}, lifetime());
Auth().data().itemViewRefreshRequest(
) | rpl::start_with_next([this](auto item) {
if (const auto view = item->mainView()) {
updateHistoryGeometry();
}
});
subscribe(Auth().data().contactsLoaded(), [this](bool) { subscribe(Auth().data().contactsLoaded(), [this](bool) {
if (_peer) { if (_peer) {
updateReportSpamStatus(); updateReportSpamStatus();
@ -3384,7 +3392,7 @@ void HistoryWidget::app_sendBotCallback(
MTP_bytes(sendData)), MTP_bytes(sendData)),
rpcDone(&HistoryWidget::botCallbackDone, info), rpcDone(&HistoryWidget::botCallbackDone, info),
rpcFail(&HistoryWidget::botCallbackFail, info)); rpcFail(&HistoryWidget::botCallbackFail, info));
Auth().data().requestItemViewRepaint(msg); Auth().data().requestItemRepaint(msg);
if (_replyToId == msg->id) { if (_replyToId == msg->id) {
cancelReply(); cancelReply();
@ -3406,7 +3414,7 @@ void HistoryWidget::botCallbackDone(
&& info.col < markup->rows[info.row].size()) { && info.col < markup->rows[info.row].size()) {
if (markup->rows[info.row][info.col].requestId == req) { if (markup->rows[info.row][info.col].requestId == req) {
markup->rows[info.row][info.col].requestId = 0; markup->rows[info.row][info.col].requestId = 0;
Auth().data().requestItemViewRepaint(item); Auth().data().requestItemRepaint(item);
} }
} }
} }
@ -3445,7 +3453,7 @@ bool HistoryWidget::botCallbackFail(
&& info.col < markup->rows[info.row].size()) { && info.col < markup->rows[info.row].size()) {
if (markup->rows[info.row][info.col].requestId == req) { if (markup->rows[info.row][info.col].requestId == req) {
markup->rows[info.row][info.col].requestId = 0; markup->rows[info.row][info.col].requestId = 0;
Auth().data().requestItemViewRepaint(item); Auth().data().requestItemRepaint(item);
} }
} }
} }
@ -4376,7 +4384,7 @@ void HistoryWidget::onPhotoProgress(const FullMsgId &newId) {
? item->media()->photo() ? item->media()->photo()
: nullptr; : nullptr;
updateSendAction(item->history(), SendAction::Type::UploadPhoto, 0); updateSendAction(item->history(), SendAction::Type::UploadPhoto, 0);
Auth().data().requestItemViewRepaint(item); Auth().data().requestItemRepaint(item);
} }
} }
@ -4394,7 +4402,7 @@ void HistoryWidget::onDocumentProgress(const FullMsgId &newId) {
item->history(), item->history(),
sendAction, sendAction,
progress); progress);
Auth().data().requestItemViewRepaint(item); Auth().data().requestItemRepaint(item);
} }
} }
@ -4404,7 +4412,7 @@ void HistoryWidget::onPhotoFailed(const FullMsgId &newId) {
item->history(), item->history(),
SendAction::Type::UploadPhoto, SendAction::Type::UploadPhoto,
-1); -1);
Auth().data().requestItemViewRepaint(item); Auth().data().requestItemRepaint(item);
} }
} }
@ -4416,7 +4424,7 @@ void HistoryWidget::onDocumentFailed(const FullMsgId &newId) {
? SendAction::Type::UploadVoice ? SendAction::Type::UploadVoice
: SendAction::Type::UploadFile; : SendAction::Type::UploadFile;
updateSendAction(item->history(), sendAction, -1); updateSendAction(item->history(), sendAction, -1);
Auth().data().requestItemViewRepaint(item); Auth().data().requestItemRepaint(item);
} }
} }
@ -4525,27 +4533,14 @@ void HistoryWidget::grabFinish() {
_topShadow->show(); _topShadow->show();
} }
void HistoryWidget::repaintHistoryItem( bool HistoryWidget::skipItemRepaint() {
not_null<const HistoryItem*> item) { auto ms = getms();
// It is possible that repaintHistoryItem() will be called from if (_lastScrolled + kSkipRepaintWhileScrollMs <= ms) {
// _scroll->setOwnedWidget() because it calls onScroll() that return false;
// sendSynteticMouseEvent() and it could lead to some Info layout
// calling Auth().data().requestItemViewRepaint(), while we still are
// in progrss of showing the history. Just ignore them for now :/
if (!_list) {
return;
}
auto itemHistory = item->history();
if (itemHistory == _history || itemHistory == _migrated) {
auto ms = getms();
if (_lastScrolled + kSkipRepaintWhileScrollMs <= ms) {
_list->repaintItem(item);
} else {
_updateHistoryItems.start(
_lastScrolled + kSkipRepaintWhileScrollMs - ms);
}
} }
_updateHistoryItems.start(
_lastScrolled + kSkipRepaintWhileScrollMs - ms);
return true;
} }
void HistoryWidget::onUpdateHistoryItems() { void HistoryWidget::onUpdateHistoryItems() {

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

@ -186,6 +186,7 @@ public:
void windowShown(); void windowShown();
bool doWeReadServerHistory() const; bool doWeReadServerHistory() const;
bool doWeReadMentions() const; bool doWeReadMentions() const;
bool skipItemRepaint();
void leaveToChildEvent(QEvent *e, QWidget *child) override; void leaveToChildEvent(QEvent *e, QWidget *child) override;
void dragEnterEvent(QDragEnterEvent *e) override; void dragEnterEvent(QDragEnterEvent *e) override;
@ -452,7 +453,6 @@ private:
using TabbedSelector = ChatHelpers::TabbedSelector; using TabbedSelector = ChatHelpers::TabbedSelector;
using DragState = Storage::MimeDataState; using DragState = Storage::MimeDataState;
void repaintHistoryItem(not_null<const HistoryItem*> item);
void handlePendingHistoryUpdate(); void handlePendingHistoryUpdate();
void fullPeerUpdated(PeerData *peer); void fullPeerUpdated(PeerData *peer);
void toggleTabbedSelectorMode(); void toggleTabbedSelectorMode();

8
Telegram/SourceFiles/history/view/history_view_list_widget.cpp
View File

@ -221,11 +221,9 @@ ListWidget::ListWidget(
, _scrollDateCheck([this] { scrollDateCheck(); }) { , _scrollDateCheck([this] { scrollDateCheck(); }) {
setMouseTracking(true); setMouseTracking(true);
_scrollDateHideTimer.setCallback([this] { scrollDateHideByTimer(); }); _scrollDateHideTimer.setCallback([this] { scrollDateHideByTimer(); });
Auth().data().itemViewRepaintRequest( Auth().data().viewRepaintRequest(
) | rpl::start_with_next([this](auto item) { ) | rpl::start_with_next([this](auto view) {
if (const auto view = viewForItem(item)) { repaintItem(view);
repaintItem(view);
}
}, lifetime()); }, lifetime());
subscribe(Auth().data().pendingHistoryResize(), [this] { handlePendingHistoryResize(); }); subscribe(Auth().data().pendingHistoryResize(), [this] { handlePendingHistoryResize(); });
subscribe(Auth().data().queryItemVisibility(), [this](const Data::Session::ItemVisibilityQuery &query) { subscribe(Auth().data().queryItemVisibility(), [this](const Data::Session::ItemVisibilityQuery &query) {

2
Telegram/SourceFiles/history/view/history_view_message.cpp
View File

@ -57,7 +57,7 @@ const style::TextStyle &KeyboardStyle::textStyle() const {
} }
void KeyboardStyle::repaint(not_null<const HistoryItem*> item) const { void KeyboardStyle::repaint(not_null<const HistoryItem*> item) const {
Auth().data().requestItemViewRepaint(item); Auth().data().requestItemRepaint(item);
} }
int KeyboardStyle::buttonRadius() const { int KeyboardStyle::buttonRadius() const {

2
Telegram/SourceFiles/info/media/info_media_list_widget.cpp
View File

@ -569,7 +569,7 @@ void ListWidget::start() {
) | rpl::start_with_next([this](auto item) { ) | rpl::start_with_next([this](auto item) {
itemRemoved(item); itemRemoved(item);
}, lifetime()); }, lifetime());
Auth().data().itemViewRepaintRequest( Auth().data().itemRepaintRequest(
) | rpl::start_with_next([this](auto item) { ) | rpl::start_with_next([this](auto item) {
repaintItem(item); repaintItem(item);
}, lifetime()); }, lifetime());

4
Telegram/SourceFiles/mainwidget.cpp
View File

@ -1579,7 +1579,7 @@ void MainWidget::handleAudioUpdate(const AudioMsgId &audioId) {
} }
if (const auto item = App::histItemById(audioId.contextId())) { if (const auto item = App::histItemById(audioId.contextId())) {
Auth().data().requestItemViewRepaint(item); Auth().data().requestItemRepaint(item);
item->audioTrackUpdated(); item->audioTrackUpdated();
} }
if (const auto items = InlineBots::Layout::documentItems()) { if (const auto items = InlineBots::Layout::documentItems()) {
@ -4826,7 +4826,7 @@ void MainWidget::feedUpdate(const MTPUpdate &update) {
if (auto item = App::histItemById(channel, msgId.v)) { if (auto item = App::histItemById(channel, msgId.v)) {
if (item->isMediaUnread()) { if (item->isMediaUnread()) {
item->markMediaRead(); item->markMediaRead();
Auth().data().requestItemViewRepaint(item); Auth().data().requestItemRepaint(item);
} }
} else { } else {
// Perhaps it was an unread mention! // Perhaps it was an unread mention!

2
Telegram/SourceFiles/media/player/media_player_float.cpp
View File

@ -51,7 +51,7 @@ Float::Float(
//) | rpl::map( //) | rpl::map(
// [](auto view) { return view->data(); } // [](auto view) { return view->data(); }
//), //),
Auth().data().itemViewRepaintRequest() Auth().data().itemRepaintRequest()
) | rpl::start_with_next([this](auto item) { ) | rpl::start_with_next([this](auto item) {
if (_item == item) { if (_item == item) {
repaintItem(); repaintItem();

10
Telegram/SourceFiles/overview/overview_layout.cpp
View File

@ -127,7 +127,7 @@ ItemBase::ItemBase(not_null<HistoryItem*> parent) : _parent(parent) {
void ItemBase::clickHandlerActiveChanged( void ItemBase::clickHandlerActiveChanged(
const ClickHandlerPtr &action, const ClickHandlerPtr &action,
bool active) { bool active) {
Auth().data().requestItemViewRepaint(_parent); Auth().data().requestItemRepaint(_parent);
if (_check) { if (_check) {
_check->setActive(active); _check->setActive(active);
} }
@ -136,7 +136,7 @@ void ItemBase::clickHandlerActiveChanged(
void ItemBase::clickHandlerPressedChanged( void ItemBase::clickHandlerPressedChanged(
const ClickHandlerPtr &action, const ClickHandlerPtr &action,
bool pressed) { bool pressed) {
Auth().data().requestItemViewRepaint(_parent); Auth().data().requestItemRepaint(_parent);
if (_check) { if (_check) {
_check->setPressed(pressed); _check->setPressed(pressed);
} }
@ -168,7 +168,7 @@ const style::RoundCheckbox &ItemBase::checkboxStyle() const {
void ItemBase::ensureCheckboxCreated() { void ItemBase::ensureCheckboxCreated() {
if (!_check) { if (!_check) {
_check = std::make_unique<Checkbox>( _check = std::make_unique<Checkbox>(
[=] { Auth().data().requestItemViewRepaint(_parent); }, [=] { Auth().data().requestItemRepaint(_parent); },
checkboxStyle()); checkboxStyle());
} }
} }
@ -203,7 +203,7 @@ void RadialProgressItem::clickHandlerActiveChanged(const ClickHandlerPtr &action
if (action == _openl || action == _savel || action == _cancell) { if (action == _openl || action == _savel || action == _cancell) {
if (iconAnimated()) { if (iconAnimated()) {
_a_iconOver.start( _a_iconOver.start(
[=] { Auth().data().requestItemViewRepaint(parent()); }, [=] { Auth().data().requestItemRepaint(parent()); },
active ? 0. : 1., active ? 0. : 1.,
active ? 1. : 0., active ? 1. : 0.,
st::msgFileOverDuration); st::msgFileOverDuration);
@ -219,7 +219,7 @@ void RadialProgressItem::setLinks(ClickHandlerPtr &&openl, ClickHandlerPtr &&sav
void RadialProgressItem::step_radial(TimeMs ms, bool timer) { void RadialProgressItem::step_radial(TimeMs ms, bool timer) {
if (timer) { if (timer) {
Auth().data().requestItemViewRepaint(parent()); Auth().data().requestItemRepaint(parent());
} else { } else {
_radial->update(dataProgress(), dataFinished(), ms); _radial->update(dataProgress(), dataFinished(), ms);
if (!_radial->animating()) { if (!_radial->animating()) {