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

Fix layout update notifications in Info::Media.

This commit is contained in:
John Preston 2018-01-21 22:52:44 +03:00
parent ebd4651ac2
commit 89941a8e83
10 changed files with 69 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,6 +235,7 @@ MediaPhoto::MediaPhoto(
not_null<PhotoData*> photo)
: Media(parent)
, _photo(photo) {
Auth().data().registerPhotoItem(_photo, parent);
}
MediaPhoto::MediaPhoto(
@ -244,9 +245,11 @@ MediaPhoto::MediaPhoto(
: Media(parent)
, _photo(photo)
, _chat(chat) {
Auth().data().registerPhotoItem(_photo, parent);
}
MediaPhoto::~MediaPhoto() {
Auth().data().unregisterPhotoItem(_photo, parent());
}
std::unique_ptr<Media> MediaPhoto::clone(not_null<HistoryItem*> parent) {

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

@ -107,19 +107,19 @@ void Session::animationLoadSettingsChanged() {
}
void Session::notifyPhotoLayoutChanged(not_null<const PhotoData*> photo) {
if (const auto i = _photoViews.find(photo); i != end(_photoViews)) {
for (const auto view : i->second) {
notifyViewLayoutChange(view);
if (const auto i = _photoItems.find(photo); i != end(_photoItems)) {
for (const auto item : i->second) {
notifyItemLayoutChange(item);
}
}
}
void Session::notifyDocumentLayoutChanged(
not_null<const DocumentData*> document) {
const auto i = _documentViews.find(document);
if (i != end(_documentViews)) {
for (const auto view : i->second) {
notifyViewLayoutChange(view);
const auto i = _documentItems.find(document);
if (i != end(_documentItems)) {
for (const auto item : i->second) {
notifyItemLayoutChange(item);
}
}
if (const auto items = InlineBots::Layout::documentItems()) {
@ -133,10 +133,10 @@ void Session::notifyDocumentLayoutChanged(
void Session::requestDocumentViewRepaint(
not_null<const DocumentData*> document) {
const auto i = _documentViews.find(document);
if (i != end(_documentViews)) {
for (const auto view : i->second) {
requestViewRepaint(view);
const auto i = _documentItems.find(document);
if (i != end(_documentItems)) {
for (const auto item : i->second) {
requestItemRepaint(item);
}
}
}
@ -148,6 +148,17 @@ void Session::markMediaRead(not_null<const DocumentData*> document) {
}
}
void Session::notifyItemLayoutChange(not_null<const HistoryItem*> item) {
_itemLayoutChanges.fire_copy(item);
enumerateItemViews(item, [&](not_null<ViewElement*> view) {
notifyViewLayoutChange(view);
});
}
rpl::producer<not_null<const HistoryItem*>> Session::itemLayoutChanged() const {
return _itemLayoutChanges.events();
}
void Session::notifyViewLayoutChange(not_null<const ViewElement*> view) {
_viewLayoutChanges.fire_copy(view);
}
@ -1131,38 +1142,20 @@ void Session::gameApplyFields(
notifyGameUpdateDelayed(game);
}
void Session::registerPhotoView(
void Session::registerPhotoItem(
not_null<const PhotoData*> photo,
not_null<ViewElement*> view) {
_photoViews[photo].insert(view);
not_null<HistoryItem*> item) {
_photoItems[photo].insert(item);
}
void Session::unregisterPhotoView(
void Session::unregisterPhotoItem(
not_null<const PhotoData*> photo,
not_null<ViewElement*> view) {
const auto i = _photoViews.find(photo);
if (i != _photoViews.end()) {
not_null<HistoryItem*> item) {
const auto i = _photoItems.find(photo);
if (i != _photoItems.end()) {
auto &items = i->second;
if (items.remove(view) && items.empty()) {
_photoViews.erase(i);
}
}
}
void Session::registerDocumentView(
not_null<const DocumentData*> document,
not_null<ViewElement*> view) {
_documentViews[document].insert(view);
}
void Session::unregisterDocumentView(
not_null<const DocumentData*> document,
not_null<ViewElement*> view) {
const auto i = _documentViews.find(document);
if (i != _documentViews.end()) {
auto &items = i->second;
if (items.remove(view) && items.empty()) {
_documentViews.erase(i);
if (items.remove(item) && items.empty()) {
_photoItems.erase(i);
}
}
}

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

@ -60,6 +60,8 @@ public:
};
void notifyItemIdChange(IdChange event);
rpl::producer<IdChange> itemIdChanged() const;
void notifyItemLayoutChange(not_null<const HistoryItem*> item);
rpl::producer<not_null<const HistoryItem*>> itemLayoutChanged() const;
void notifyViewLayoutChange(not_null<const ViewElement*> view);
rpl::producer<not_null<const ViewElement*>> viewLayoutChanged() const;
void requestItemRepaint(not_null<const HistoryItem*> item);
@ -273,18 +275,12 @@ public:
not_null<GameData*> original,
const MTPGame &data);
void registerPhotoView(
void registerPhotoItem(
not_null<const PhotoData*> photo,
not_null<ViewElement*> view);
void unregisterPhotoView(
not_null<HistoryItem*> item);
void unregisterPhotoItem(
not_null<const PhotoData*> photo,
not_null<ViewElement*> view);
void registerDocumentView(
not_null<const DocumentData*> document,
not_null<ViewElement*> view);
void unregisterDocumentView(
not_null<const DocumentData*> document,
not_null<ViewElement*> view);
not_null<HistoryItem*> item);
void registerDocumentItem(
not_null<const DocumentData*> document,
not_null<HistoryItem*> item);
@ -439,6 +435,7 @@ private:
base::Observable<void> _moreChatsLoaded;
base::Observable<ItemVisibilityQuery> _queryItemVisibility;
rpl::event_stream<IdChange> _itemIdChanges;
rpl::event_stream<not_null<const HistoryItem*>> _itemLayoutChanges;
rpl::event_stream<not_null<const ViewElement*>> _viewLayoutChanges;
rpl::event_stream<not_null<const HistoryItem*>> _itemRepaintRequest;
rpl::event_stream<not_null<const ViewElement*>> _viewRepaintRequest;
@ -473,16 +470,13 @@ private:
std::unique_ptr<PhotoData>> _photos;
std::map<
not_null<const PhotoData*>,
base::flat_set<not_null<ViewElement*>>> _photoViews;
base::flat_set<not_null<HistoryItem*>>> _photoItems;
std::unordered_map<
DocumentId,
std::unique_ptr<DocumentData>> _documents;
std::map<
not_null<const DocumentData*>,
base::flat_set<not_null<HistoryItem*>>> _documentItems;
std::map<
not_null<const DocumentData*>,
base::flat_set<not_null<ViewElement*>>> _documentViews;
std::unordered_map<
WebPageId,
std::unique_ptr<WebPageData>> _webpages;

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

@ -231,6 +231,14 @@ InnerWidget::InnerWidget(
refreshItem(view);
}
}, lifetime());
Auth().data().viewLayoutChanged(
) | rpl::start_with_next([this](auto view) {
if (view->delegate() == this) {
if (view->isUnderCursor()) {
updateSelected();
}
}
}, lifetime());
Auth().data().animationPlayInlineRequest(
) | rpl::start_with_next([this](auto item) {
if (const auto view = viewForItem(item)) {

21
Telegram/SourceFiles/history/history_media_types.cpp
View File

@ -245,7 +245,6 @@ HistoryPhoto::HistoryPhoto(
}
void HistoryPhoto::create(FullMsgId contextId, PeerData *chat) {
Auth().data().registerPhotoView(_data, _parent);
setLinks(
std::make_shared<PhotoOpenClickHandler>(_data, contextId, chat),
std::make_shared<PhotoSaveClickHandler>(_data, contextId, chat),
@ -707,28 +706,11 @@ ImagePtr HistoryPhoto::replyPreview() {
return _data->makeReplyPreview();
}
HistoryPhoto::~HistoryPhoto() {
Auth().data().unregisterPhotoView(_data, _parent);
}
DocumentViewRegister::DocumentViewRegister(
not_null<HistoryView::Element*> parent,
not_null<DocumentData*> document)
: _savedParent(parent)
, _savedDocument(document) {
Auth().data().registerDocumentView(_savedDocument, _savedParent);
}
DocumentViewRegister::~DocumentViewRegister() {
Auth().data().unregisterDocumentView(_savedDocument, _savedParent);
}
HistoryVideo::HistoryVideo(
not_null<Element*> parent,
not_null<HistoryItem*> realParent,
not_null<DocumentData*> document)
: HistoryFileMedia(parent)
, DocumentViewRegister(parent, document)
, _data(document)
, _thumbw(1)
, _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
@ -1197,7 +1179,6 @@ HistoryDocument::HistoryDocument(
not_null<Element*> parent,
not_null<DocumentData*> document)
: HistoryFileMedia(parent)
, DocumentViewRegister(parent, document)
, _data(document) {
const auto item = parent->data();
auto caption = createCaption(item);
@ -1934,7 +1915,6 @@ HistoryGif::HistoryGif(
not_null<Element*> parent,
not_null<DocumentData*> document)
: HistoryFileMedia(parent)
, DocumentViewRegister(parent, document)
, _data(document)
, _caption(st::minPhotoSize - st::msgPadding.left() - st::msgPadding.right()) {
const auto item = parent->data();
@ -2782,7 +2762,6 @@ HistorySticker::HistorySticker(
not_null<Element*> parent,
not_null<DocumentData*> document)
: HistoryMedia(parent)
, DocumentViewRegister(parent, document)
, _data(document)
, _emoji(_data->sticker()->alt) {
_data->thumb->load();

22
Telegram/SourceFiles/history/history_media_types.h
View File

@ -200,8 +200,6 @@ public:
return _data->loaded();
}
~HistoryPhoto();
protected:
float64 dataProgress() const override;
bool dataFinished() const override;
@ -228,20 +226,7 @@ private:
};
class DocumentViewRegister {
public:
DocumentViewRegister(
not_null<HistoryView::Element*> parent,
not_null<DocumentData*> document);
~DocumentViewRegister();
private:
not_null<HistoryView::Element*> _savedParent;
not_null<DocumentData*> _savedDocument;
};
class HistoryVideo : public HistoryFileMedia, public DocumentViewRegister {
class HistoryVideo : public HistoryFileMedia {
public:
HistoryVideo(
not_null<Element*> parent,
@ -333,7 +318,6 @@ private:
class HistoryDocument
: public HistoryFileMedia
, public DocumentViewRegister
, public RuntimeComposer<HistoryDocument> {
public:
HistoryDocument(
@ -415,7 +399,7 @@ private:
};
class HistoryGif : public HistoryFileMedia, public DocumentViewRegister {
class HistoryGif : public HistoryFileMedia {
public:
HistoryGif(
not_null<Element*> parent,
@ -516,7 +500,7 @@ private:
};
class HistorySticker : public HistoryMedia, public DocumentViewRegister {
class HistorySticker : public HistoryMedia {
public:
HistorySticker(
not_null<Element*> parent,

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

@ -665,11 +665,9 @@ HistoryWidget::HistoryWidget(QWidget *parent, not_null<Window::Controller*> cont
});
Auth().data().viewLayoutChanged(
) | rpl::start_with_next([this](auto view) {
if (_peer && _list) {
if (view == view->data()->mainView()) {
if (view->isUnderCursor()) {
_list->onUpdateSelected();
}
if (view == view->data()->mainView()) {
if (view->isUnderCursor() && _list) {
_list->onUpdateSelected();
}
}
}, lifetime());

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

@ -240,6 +240,14 @@ ListWidget::ListWidget(
refreshItem(view);
}
}, lifetime());
Auth().data().viewLayoutChanged(
) | rpl::start_with_next([this](auto view) {
if (view->delegate() == this) {
if (view->isUnderCursor()) {
updateSelected();
}
}
}, lifetime());
Auth().data().animationPlayInlineRequest(
) | rpl::start_with_next([this](auto item) {
if (const auto view = viewForItem(item)) {

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

@ -561,10 +561,10 @@ void ListWidget::start() {
ObservableViewer(
Auth().downloader().taskFinished()
) | rpl::start_with_next([this] { update(); }, lifetime());
//Auth().data().itemLayoutChanged( // #TODO
//) | rpl::start_with_next([this](auto item) {
// itemLayoutChanged(item);
//}, lifetime());
Auth().data().itemLayoutChanged(
) | rpl::start_with_next([this](auto item) {
itemLayoutChanged(item);
}, lifetime());
Auth().data().itemRemoved(
) | rpl::start_with_next([this](auto item) {
itemRemoved(item);

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

@ -50,12 +50,7 @@ Float::Float(
prepareShadow();
rpl::merge(
//Auth().data().viewLayoutChanged( // #TODO not needed?
//) | rpl::map(
// [](auto view) { return view->data(); }
//),
Auth().data().itemRepaintRequest()
Auth().data().itemRepaintRequest(
) | rpl::start_with_next([this](auto item) {
if (_item == item) {
repaintItem();