From 91f369a0b364280bfee8affb1cce69522dcc43c3 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 18 Jan 2018 14:46:45 +0300 Subject: [PATCH] Handle view resize/repaint requests for mainView. --- Telegram/SourceFiles/apiwrap.cpp | 6 +- Telegram/SourceFiles/data/data_session.cpp | 40 ++++++++----- Telegram/SourceFiles/data/data_session.h | 32 ++++++----- .../dialogs/dialogs_inner_widget.cpp | 2 +- Telegram/SourceFiles/facades.cpp | 2 +- .../admin_log/history_admin_log_inner.cpp | 8 +-- .../history/history_inner_widget.cpp | 20 ++++--- Telegram/SourceFiles/history/history_item.cpp | 8 +-- .../history/history_item_components.cpp | 4 +- .../SourceFiles/history/history_message.cpp | 16 +++--- .../SourceFiles/history/history_service.cpp | 4 +- .../SourceFiles/history/history_widget.cpp | 57 +++++++++---------- Telegram/SourceFiles/history/history_widget.h | 2 +- .../history/view/history_view_list_widget.cpp | 8 +-- .../history/view/history_view_message.cpp | 2 +- .../info/media/info_media_list_widget.cpp | 2 +- Telegram/SourceFiles/mainwidget.cpp | 4 +- .../media/player/media_player_float.cpp | 2 +- .../SourceFiles/overview/overview_layout.cpp | 10 ++-- 19 files changed, 121 insertions(+), 108 deletions(-) diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp index 579981c8a..7e33e0cb3 100644 --- a/Telegram/SourceFiles/apiwrap.cpp +++ b/Telegram/SourceFiles/apiwrap.cpp @@ -1785,7 +1785,7 @@ void ApiWrap::gotWebPages(ChannelData *channel, const MTPmessages_Messages &msgs v->at(index), NewMessageExisting); 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 (item->isMediaUnread()) { item->markMediaRead(); - _session->data().requestItemViewRepaint(item); + _session->data().requestItemRepaint(item); if (item->out() && item->history()->peer->isUser()) { auto when = App::main()->requestingDifference() ? 0 : unixtime(); @@ -3134,7 +3134,7 @@ void ApiWrap::sendMediaWithRandomId( | (IsSilentPost(item, silent) ? MTPmessages_SendMedia::Flag::f_silent : MTPmessages_SendMedia::Flag(0)); - const auto message = QString(); // #TODO l76 + const auto message = QString(); // #TODO l76 caption history->sendRequestId = request(MTPmessages_SendMedia( MTP_flags(flags), history->peer->input, diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp index 3b2eaaf6e..e7194f2bb 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp @@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "observer_peer.h" #include "auth_session.h" #include "apiwrap.h" +#include "history/history.h" #include "history/history_item_components.h" #include "history/history_media.h" #include "history/view/history_view_element.h" @@ -74,7 +75,7 @@ Session::~Session() = default; template void Session::enumerateItemViews( - not_null item, + not_null item, Method method) { if (const auto i = _views.find(item); i != _views.end()) { for (const auto view : i->second) { @@ -166,12 +167,15 @@ rpl::producer Session::itemIdChanged() const { return _itemIdChanges.events(); } -void Session::requestItemViewRepaint(not_null item) { - _itemViewRepaintRequest.fire_copy(item); +void Session::requestItemRepaint(not_null item) { + _itemRepaintRequest.fire_copy(item); + enumerateItemViews(item, [&](not_null view) { + requestViewRepaint(view); + }); } -rpl::producer> Session::itemViewRepaintRequest() const { - return _itemViewRepaintRequest.events(); +rpl::producer> Session::itemRepaintRequest() const { + return _itemRepaintRequest.events(); } void Session::requestViewRepaint(not_null view) { @@ -182,23 +186,32 @@ rpl::producer> Session::viewRepaintRequest() const return _viewRepaintRequest.events(); } -void Session::requestItemViewResize(not_null item) { - _itemViewResizeRequest.fire_copy(item); +void Session::requestItemResize(not_null item) { + _itemResizeRequest.fire_copy(item); + enumerateItemViews(item, [&](not_null view) { + requestViewResize(view); + }); } -rpl::producer> Session::itemViewResizeRequest() const { - return _itemViewResizeRequest.events(); +rpl::producer> Session::itemResizeRequest() const { + return _itemResizeRequest.events(); } -void Session::requestViewResize(not_null view) { +void Session::requestViewResize(not_null view) { + if (view == view->data()->mainView()) { + view->setPendingResize(); + } _viewResizeRequest.fire_copy(view); } -rpl::producer> Session::viewResizeRequest() const { +rpl::producer> Session::viewResizeRequest() const { return _viewResizeRequest.events(); } void Session::requestItemViewRefresh(not_null item) { + if (const auto view = item->mainView()) { + view->setPendingResize(); + } _itemViewRefreshRequest.fire_copy(item); } @@ -238,11 +251,12 @@ rpl::producer> Session::historyCleared() const { return _historyCleared.events(); } -void Session::notifyHistoryChangeDelayed(not_null history) { +void Session::notifyHistoryChangeDelayed(not_null history) { _historiesChanged.insert(history); + history->setPendingResize(); } -rpl::producer> Session::historyChanged() const { +rpl::producer> Session::historyChanged() const { return _historyChanged.events(); } diff --git a/Telegram/SourceFiles/data/data_session.h b/Telegram/SourceFiles/data/data_session.h index 27bbda686..27bfb84b0 100644 --- a/Telegram/SourceFiles/data/data_session.h +++ b/Telegram/SourceFiles/data/data_session.h @@ -65,14 +65,14 @@ public: rpl::producer itemIdChanged() const; void notifyViewLayoutChange(not_null view); rpl::producer> viewLayoutChanged() const; - void requestItemViewRepaint(not_null item); - rpl::producer> itemViewRepaintRequest() const; + void requestItemRepaint(not_null item); + rpl::producer> itemRepaintRequest() const; void requestViewRepaint(not_null view); rpl::producer> viewRepaintRequest() const; - void requestItemViewResize(not_null item); - rpl::producer> itemViewResizeRequest() const; - void requestViewResize(not_null view); - rpl::producer> viewResizeRequest() const; + void requestItemResize(not_null item); + rpl::producer> itemResizeRequest() const; + void requestViewResize(not_null view); + rpl::producer> viewResizeRequest() const; void requestItemViewRefresh(not_null item); rpl::producer> itemViewRefreshRequest() const; void requestItemPlayInline(not_null item); @@ -84,8 +84,8 @@ public: rpl::producer> itemRemoved() const; void notifyHistoryCleared(not_null history); rpl::producer> historyCleared() const; - void notifyHistoryChangeDelayed(not_null history); - rpl::producer> historyChanged() const; + void notifyHistoryChangeDelayed(not_null history); + rpl::producer> historyChanged() const; void sendHistoryChangeNotifications(); using MegagroupParticipant = std::tuple< @@ -431,7 +431,9 @@ private: void setIsPinned(const Dialogs::Key &key, bool pinned); template - void enumerateItemViews(not_null item, Method method); + void enumerateItemViews( + not_null item, + Method method); not_null _session; @@ -442,17 +444,17 @@ private: base::Observable _queryItemVisibility; rpl::event_stream _itemIdChanges; rpl::event_stream> _viewLayoutChanges; - rpl::event_stream> _itemViewRepaintRequest; + rpl::event_stream> _itemRepaintRequest; rpl::event_stream> _viewRepaintRequest; - rpl::event_stream> _itemViewResizeRequest; - rpl::event_stream> _viewResizeRequest; + rpl::event_stream> _itemResizeRequest; + rpl::event_stream> _viewResizeRequest; rpl::event_stream> _itemViewRefreshRequest; rpl::event_stream> _itemPlayInlineRequest; rpl::event_stream> _itemRemoved; rpl::event_stream> _historyUnloaded; rpl::event_stream> _historyCleared; - base::flat_set> _historiesChanged; - rpl::event_stream> _historyChanged; + base::flat_set> _historiesChanged; + rpl::event_stream> _historyChanged; rpl::event_stream _megagroupParticipantRemoved; rpl::event_stream _megagroupParticipantAdded; @@ -517,7 +519,7 @@ private: base::flat_map> _feeds; Groups _groups; std::map< - not_null, + not_null, std::vector>> _views; MessageIdsList _mimeForwardIds; diff --git a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp index 5906aa38e..7ab40c99f 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp @@ -94,7 +94,7 @@ DialogsInner::DialogsInner(QWidget *parent, not_null contro ) | rpl::start_with_next( [this](auto item) { itemRemoved(item); }, lifetime()); - Auth().data().itemViewRepaintRequest( + Auth().data().itemRepaintRequest( ) | rpl::start_with_next([this](auto item) { const auto history = item->history(); if (history->textCachedFor == item) { diff --git a/Telegram/SourceFiles/facades.cpp b/Telegram/SourceFiles/facades.cpp index 09fea4e7d..b26bfabab 100644 --- a/Telegram/SourceFiles/facades.cpp +++ b/Telegram/SourceFiles/facades.cpp @@ -350,7 +350,7 @@ void handlePendingHistoryUpdate() { Auth().data().pendingHistoryResize().notify(true); //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. //if (item->pendingInitDimensions()) { // #TODO floating player video diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp index dc286e23f..87d43b35b 100644 --- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp +++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp @@ -213,11 +213,9 @@ InnerWidget::InnerWidget( , _emptyText(st::historyAdminLogEmptyWidth - st::historyAdminLogEmptyPadding.left() - st::historyAdminLogEmptyPadding.left()) { setMouseTracking(true); _scrollDateHideTimer.setCallback([this] { scrollDateHideByTimer(); }); - Auth().data().itemViewRepaintRequest( - ) | rpl::start_with_next([this](auto item) { - if (item->isLogEntry() && _history == item->history()) { - repaintItem(viewForItem(item)); - } + Auth().data().viewRepaintRequest( + ) | rpl::start_with_next([this](auto view) { + repaintItem(view); // #TODO check my view }, lifetime()); subscribe(Auth().data().pendingHistoryResize(), [this] { handlePendingHistoryResize(); }); subscribe(Auth().data().queryItemVisibility(), [this](const Data::Session::ItemVisibilityQuery &query) { diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp index c4c86db42..2c8e8203c 100644 --- a/Telegram/SourceFiles/history/history_inner_widget.cpp +++ b/Telegram/SourceFiles/history/history_inner_widget.cpp @@ -164,6 +164,10 @@ HistoryInner::HistoryInner( }) | rpl::start_with_next([this] { mouseActionCancel(); }, lifetime()); + Auth().data().viewRepaintRequest( + ) | rpl::start_with_next( + [this](auto view) { repaintItem(view); }, + lifetime()); } void HistoryInner::messagesReceived(PeerData *peer, const QVector &messages) { @@ -191,17 +195,19 @@ void HistoryInner::messagesReceivedDown(PeerData *peer, const QVectormainView()); + if (!item) { + return; } + repaintItem(item->mainView()); } void HistoryInner::repaintItem(const Element *view) { - if (view) { - const auto top = itemTop(view); - if (top >= 0) { - update(0, top, width(), view->height()); - } + if (_widget->skipItemRepaint()) { + return; + } + const auto top = itemTop(view); + if (top >= 0) { + update(0, top, width(), view->height()); } } diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index 5333d5401..33f203c3f 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -339,7 +339,7 @@ void HistoryItem::setRealId(MsgId newId) { } Auth().data().notifyItemIdChange({ this, oldId }); - Auth().data().requestItemViewRepaint(this); + Auth().data().requestItemRepaint(this); } bool HistoryItem::isPinned() const { @@ -573,7 +573,7 @@ void HistoryItem::destroyUnreadBar() { Assert(!isLogEntry()); RemoveComponents(HistoryMessageUnreadBar::Bit()); - Auth().data().requestItemViewResize(this); + Auth().data().requestItemResize(this); if (_history->unreadBar == this) { _history->unreadBar = nullptr; } @@ -587,7 +587,7 @@ void HistoryItem::setUnreadBarCount(int count) { if (count > 0) { if (!Has()) { AddComponents(HistoryMessageUnreadBar::Bit()); - Auth().data().requestItemViewResize(this); + Auth().data().requestItemResize(this); // #TODO recount attach to previous } const auto bar = Get(); @@ -595,7 +595,7 @@ void HistoryItem::setUnreadBarCount(int count) { return; } bar->init(count); - Auth().data().requestItemViewRepaint(this); + Auth().data().requestItemRepaint(this); } else { destroyUnreadBar(); } diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp index 7481f5765..f00762690 100644 --- a/Telegram/SourceFiles/history/history_item_components.cpp +++ b/Telegram/SourceFiles/history/history_item_components.cpp @@ -163,7 +163,7 @@ bool HistoryMessageReply::updateData(HistoryMessage *holder, bool force) { replyToMsgId = 0; } if (force) { - Auth().data().requestItemViewResize(holder); + Auth().data().requestItemResize(holder); } return (replyToMsg || !replyToMsgId); } @@ -219,7 +219,7 @@ void HistoryMessageReply::itemRemoved( HistoryItem *removed) { if (replyToMsg == removed) { clearData(holder); - Auth().data().requestItemViewResize(holder); + Auth().data().requestItemResize(holder); } } diff --git a/Telegram/SourceFiles/history/history_message.cpp b/Telegram/SourceFiles/history/history_message.cpp index feacc3b8e..289dc1aab 100644 --- a/Telegram/SourceFiles/history/history_message.cpp +++ b/Telegram/SourceFiles/history/history_message.cpp @@ -552,7 +552,7 @@ void HistoryMessage::applyGroupAdminChanges( } else { _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); } } - Auth().data().requestItemViewResize(this); + Auth().data().requestItemResize(this); } void HistoryMessage::addToUnreadMentions(UnreadMentionType type) { @@ -1003,7 +1003,7 @@ void HistoryMessage::setReplyMarkup(const MTPReplyMarkup *markup) { if (Has()) { RemoveComponents(HistoryMessageReplyMarkup::Bit()); } - Auth().data().requestItemViewResize(this); + Auth().data().requestItemResize(this); Notify::replyMarkupUpdated(this); } return; @@ -1022,7 +1022,7 @@ void HistoryMessage::setReplyMarkup(const MTPReplyMarkup *markup) { changed = true; } if (changed) { - Auth().data().requestItemViewResize(this); + Auth().data().requestItemResize(this); Notify::replyMarkupUpdated(this); } } else { @@ -1033,7 +1033,7 @@ void HistoryMessage::setReplyMarkup(const MTPReplyMarkup *markup) { AddComponents(HistoryMessageReplyMarkup::Bit()); } Get()->create(*markup); - Auth().data().requestItemViewResize(this); + Auth().data().requestItemResize(this); Notify::replyMarkupUpdated(this); } } @@ -1066,16 +1066,16 @@ void HistoryMessage::setViewsCount(int32 count) { ? 0 : st::msgDateFont->width(views->_viewsText); if (was == views->_viewsWidth) { - Auth().data().requestItemViewRepaint(this); + Auth().data().requestItemRepaint(this); } else { - Auth().data().requestItemViewResize(this); + Auth().data().requestItemResize(this); } } void HistoryMessage::setRealId(MsgId newId) { HistoryItem::setRealId(newId); Auth().data().groups().refreshMessage(this); - Auth().data().requestItemViewResize(this); + Auth().data().requestItemResize(this); } void HistoryMessage::dependencyItemRemoved(HistoryItem *dependency) { diff --git a/Telegram/SourceFiles/history/history_service.cpp b/Telegram/SourceFiles/history/history_service.cpp index 03debb0be..37f9465f7 100644 --- a/Telegram/SourceFiles/history/history_service.cpp +++ b/Telegram/SourceFiles/history/history_service.cpp @@ -588,7 +588,7 @@ void HistoryService::removeMedia() { _media.reset(); _textWidth = -1; _textHeight = 0; - Auth().data().requestItemViewResize(this); + Auth().data().requestItemResize(this); } Storage::SharedMediaTypesMask HistoryService::sharedMediaTypes() const { @@ -611,7 +611,7 @@ void HistoryService::updateDependentText() { } setServiceText(text); - Auth().data().requestItemViewResize(this); + Auth().data().requestItemResize(this); if (history()->textCachedFor == this) { history()->textCachedFor = nullptr; } diff --git a/Telegram/SourceFiles/history/history_widget.cpp b/Telegram/SourceFiles/history/history_widget.cpp index 8a19758a4..3e99a6255 100644 --- a/Telegram/SourceFiles/history/history_widget.cpp +++ b/Telegram/SourceFiles/history/history_widget.cpp @@ -559,14 +559,22 @@ HistoryWidget::HistoryWidget(QWidget *parent, not_null cont ) | rpl::start_with_next( [this](auto item) { itemRemoved(item); }, lifetime()); - Auth().data().itemViewRepaintRequest( - ) | rpl::start_with_next( - [this](auto item) { repaintHistoryItem(item); }, - lifetime()); Auth().data().historyChanged( ) | rpl::start_with_next( [=](auto history) { handleHistoryChange(history); }, 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) { if (_peer) { updateReportSpamStatus(); @@ -3384,7 +3392,7 @@ void HistoryWidget::app_sendBotCallback( MTP_bytes(sendData)), rpcDone(&HistoryWidget::botCallbackDone, info), rpcFail(&HistoryWidget::botCallbackFail, info)); - Auth().data().requestItemViewRepaint(msg); + Auth().data().requestItemRepaint(msg); if (_replyToId == msg->id) { cancelReply(); @@ -3406,7 +3414,7 @@ void HistoryWidget::botCallbackDone( && info.col < markup->rows[info.row].size()) { if (markup->rows[info.row][info.col].requestId == req) { 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()) { if (markup->rows[info.row][info.col].requestId == req) { 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() : nullptr; 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(), sendAction, progress); - Auth().data().requestItemViewRepaint(item); + Auth().data().requestItemRepaint(item); } } @@ -4404,7 +4412,7 @@ void HistoryWidget::onPhotoFailed(const FullMsgId &newId) { item->history(), SendAction::Type::UploadPhoto, -1); - Auth().data().requestItemViewRepaint(item); + Auth().data().requestItemRepaint(item); } } @@ -4416,7 +4424,7 @@ void HistoryWidget::onDocumentFailed(const FullMsgId &newId) { ? SendAction::Type::UploadVoice : SendAction::Type::UploadFile; updateSendAction(item->history(), sendAction, -1); - Auth().data().requestItemViewRepaint(item); + Auth().data().requestItemRepaint(item); } } @@ -4525,27 +4533,14 @@ void HistoryWidget::grabFinish() { _topShadow->show(); } -void HistoryWidget::repaintHistoryItem( - not_null item) { - // It is possible that repaintHistoryItem() will be called from - // _scroll->setOwnedWidget() because it calls onScroll() that - // 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); - } +bool HistoryWidget::skipItemRepaint() { + auto ms = getms(); + if (_lastScrolled + kSkipRepaintWhileScrollMs <= ms) { + return false; } + _updateHistoryItems.start( + _lastScrolled + kSkipRepaintWhileScrollMs - ms); + return true; } void HistoryWidget::onUpdateHistoryItems() { diff --git a/Telegram/SourceFiles/history/history_widget.h b/Telegram/SourceFiles/history/history_widget.h index b2ff35d25..9f5e16091 100644 --- a/Telegram/SourceFiles/history/history_widget.h +++ b/Telegram/SourceFiles/history/history_widget.h @@ -186,6 +186,7 @@ public: void windowShown(); bool doWeReadServerHistory() const; bool doWeReadMentions() const; + bool skipItemRepaint(); void leaveToChildEvent(QEvent *e, QWidget *child) override; void dragEnterEvent(QDragEnterEvent *e) override; @@ -452,7 +453,6 @@ private: using TabbedSelector = ChatHelpers::TabbedSelector; using DragState = Storage::MimeDataState; - void repaintHistoryItem(not_null item); void handlePendingHistoryUpdate(); void fullPeerUpdated(PeerData *peer); void toggleTabbedSelectorMode(); diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp index bc50f44a8..016a4eae8 100644 --- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp +++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp @@ -221,11 +221,9 @@ ListWidget::ListWidget( , _scrollDateCheck([this] { scrollDateCheck(); }) { setMouseTracking(true); _scrollDateHideTimer.setCallback([this] { scrollDateHideByTimer(); }); - Auth().data().itemViewRepaintRequest( - ) | rpl::start_with_next([this](auto item) { - if (const auto view = viewForItem(item)) { - repaintItem(view); - } + Auth().data().viewRepaintRequest( + ) | rpl::start_with_next([this](auto view) { + repaintItem(view); }, lifetime()); subscribe(Auth().data().pendingHistoryResize(), [this] { handlePendingHistoryResize(); }); subscribe(Auth().data().queryItemVisibility(), [this](const Data::Session::ItemVisibilityQuery &query) { diff --git a/Telegram/SourceFiles/history/view/history_view_message.cpp b/Telegram/SourceFiles/history/view/history_view_message.cpp index bea34717c..73000510b 100644 --- a/Telegram/SourceFiles/history/view/history_view_message.cpp +++ b/Telegram/SourceFiles/history/view/history_view_message.cpp @@ -57,7 +57,7 @@ const style::TextStyle &KeyboardStyle::textStyle() const { } void KeyboardStyle::repaint(not_null item) const { - Auth().data().requestItemViewRepaint(item); + Auth().data().requestItemRepaint(item); } int KeyboardStyle::buttonRadius() const { diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp index c92f183d9..4852c093e 100644 --- a/Telegram/SourceFiles/info/media/info_media_list_widget.cpp +++ b/Telegram/SourceFiles/info/media/info_media_list_widget.cpp @@ -569,7 +569,7 @@ void ListWidget::start() { ) | rpl::start_with_next([this](auto item) { itemRemoved(item); }, lifetime()); - Auth().data().itemViewRepaintRequest( + Auth().data().itemRepaintRequest( ) | rpl::start_with_next([this](auto item) { repaintItem(item); }, lifetime()); diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index d3d5664b0..dc2f30820 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -1579,7 +1579,7 @@ void MainWidget::handleAudioUpdate(const AudioMsgId &audioId) { } if (const auto item = App::histItemById(audioId.contextId())) { - Auth().data().requestItemViewRepaint(item); + Auth().data().requestItemRepaint(item); item->audioTrackUpdated(); } 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 (item->isMediaUnread()) { item->markMediaRead(); - Auth().data().requestItemViewRepaint(item); + Auth().data().requestItemRepaint(item); } } else { // Perhaps it was an unread mention! diff --git a/Telegram/SourceFiles/media/player/media_player_float.cpp b/Telegram/SourceFiles/media/player/media_player_float.cpp index c7602f6b2..d0c54a7f7 100644 --- a/Telegram/SourceFiles/media/player/media_player_float.cpp +++ b/Telegram/SourceFiles/media/player/media_player_float.cpp @@ -51,7 +51,7 @@ Float::Float( //) | rpl::map( // [](auto view) { return view->data(); } //), - Auth().data().itemViewRepaintRequest() + Auth().data().itemRepaintRequest() ) | rpl::start_with_next([this](auto item) { if (_item == item) { repaintItem(); diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp index 71325ad41..9249a49f7 100644 --- a/Telegram/SourceFiles/overview/overview_layout.cpp +++ b/Telegram/SourceFiles/overview/overview_layout.cpp @@ -127,7 +127,7 @@ ItemBase::ItemBase(not_null parent) : _parent(parent) { void ItemBase::clickHandlerActiveChanged( const ClickHandlerPtr &action, bool active) { - Auth().data().requestItemViewRepaint(_parent); + Auth().data().requestItemRepaint(_parent); if (_check) { _check->setActive(active); } @@ -136,7 +136,7 @@ void ItemBase::clickHandlerActiveChanged( void ItemBase::clickHandlerPressedChanged( const ClickHandlerPtr &action, bool pressed) { - Auth().data().requestItemViewRepaint(_parent); + Auth().data().requestItemRepaint(_parent); if (_check) { _check->setPressed(pressed); } @@ -168,7 +168,7 @@ const style::RoundCheckbox &ItemBase::checkboxStyle() const { void ItemBase::ensureCheckboxCreated() { if (!_check) { _check = std::make_unique( - [=] { Auth().data().requestItemViewRepaint(_parent); }, + [=] { Auth().data().requestItemRepaint(_parent); }, checkboxStyle()); } } @@ -203,7 +203,7 @@ void RadialProgressItem::clickHandlerActiveChanged(const ClickHandlerPtr &action if (action == _openl || action == _savel || action == _cancell) { if (iconAnimated()) { _a_iconOver.start( - [=] { Auth().data().requestItemViewRepaint(parent()); }, + [=] { Auth().data().requestItemRepaint(parent()); }, active ? 0. : 1., active ? 1. : 0., st::msgFileOverDuration); @@ -219,7 +219,7 @@ void RadialProgressItem::setLinks(ClickHandlerPtr &&openl, ClickHandlerPtr &&sav void RadialProgressItem::step_radial(TimeMs ms, bool timer) { if (timer) { - Auth().data().requestItemViewRepaint(parent()); + Auth().data().requestItemRepaint(parent()); } else { _radial->update(dataProgress(), dataFinished(), ms); if (!_radial->animating()) {