mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Use shared_ptr<Memento> for sections.

Browse Source
This commit is contained in:
John Preston
2020-12-14 18:48:10 +04:00
parent baba7e272d
commit b6483cb65c
54 changed files with 147 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/window/notifications_manager.cpp
View File

@@ -650,7 +650,7 @@ void Manager::openNotificationMessage(
Ui::showPeerHistory(history, messageId);
//} else if (messageFeed) { // #feed
// App::wnd()->sessionController()->showSection(
// std::make_unique<HistoryFeed::Memento>(messageFeed));
// std::make_shared<HistoryFeed::Memento>(messageFeed));
} else {
Ui::showPeerHistory(history, ShowAtUnreadMsgId);
}

2
Telegram/SourceFiles/window/section_widget.cpp
View File

@@ -70,7 +70,7 @@ void SectionWidget::showAnimated(
show();
}
std::unique_ptr<SectionMemento> SectionWidget::createMemento() {
std::shared_ptr<SectionMemento> SectionWidget::createMemento() {
return nullptr;
}

2
Telegram/SourceFiles/window/section_widget.h
View File

@@ -135,7 +135,7 @@ public:
// Create a memento of that section to store it in the history stack.
// This method may modify the section ("take" heavy items).
virtual std::unique_ptr<SectionMemento> createMemento();
virtual std::shared_ptr<SectionMemento> createMemento();
void setInnerFocus() {
doSetInnerFocus();

2
Telegram/SourceFiles/window/window_peer_menu.cpp
View File

@@ -714,7 +714,7 @@ void Filler::addTogglesForArchive() {
// const auto controller = _controller;
// const auto feed = _feed;
// _addAction(tr::lng_context_view_feed_info(tr::now), [=] {
// controller->showSection(std::make_unique<Info::Memento>(
// controller->showSection(std::make_shared<Info::Memento>(
// feed,
// Info::Section(Info::Section::Type::Profile)));
// });

18
Telegram/SourceFiles/window/window_session_controller.cpp
View File

@@ -253,12 +253,12 @@ void SessionNavigation::showRepliesForMessage(
const auto channelId = history->channelId();
//const auto item = _session->data().message(channelId, rootId);
//if (!commentId && (!item || !item->repliesAreComments())) {
// showSection(std::make_unique<HistoryView::RepliesMemento>(history, rootId));
// showSection(std::make_shared<HistoryView::RepliesMemento>(history, rootId));
// return;
//} else if (const auto id = item ? item->commentsItemId() : FullMsgId()) {
// if (const auto commentsItem = _session->data().message(id)) {
// showSection(
// std::make_unique<HistoryView::RepliesMemento>(commentsItem));
// std::make_shared<HistoryView::RepliesMemento>(commentsItem));
// return;
// }
//}
@@ -314,7 +314,7 @@ void SessionNavigation::showRepliesForMessage(
post->setRepliesOutboxReadTill(readTill->v);
}
}
showSection(std::make_unique<HistoryView::RepliesMemento>(
showSection(std::make_shared<HistoryView::RepliesMemento>(
item,
commentId));
}
@@ -342,7 +342,7 @@ void SessionNavigation::showPeerInfo(
// Core::App().settings().setThirdSectionInfoEnabled(true);
// Core::App().saveSettingsDelayed();
//}
showSection(std::make_unique<Info::Memento>(peer), params);
showSection(std::make_shared<Info::Memento>(peer), params);
}
void SessionNavigation::showPeerInfo(
@@ -375,7 +375,7 @@ void SessionNavigation::showSettings(
Settings::Type type,
const SectionShow &params) {
showSection(
std::make_unique<Info::Memento>(
std::make_shared<Info::Memento>(
Info::Settings::Tag{ _session->user() },
Info::Section(type)),
params);
@@ -389,7 +389,7 @@ void SessionNavigation::showPollResults(
not_null<PollData*> poll,
FullMsgId contextId,
const SectionShow &params) {
showSection(std::make_unique<Info::Memento>(poll, contextId), params);
showSection(std::make_shared<Info::Memento>(poll, contextId), params);
}
SessionController::SessionController(
@@ -640,9 +640,9 @@ bool SessionController::jumpToChatListEntry(Dialogs::RowDescriptor row) {
return true;
//} else if (const auto feed = row.key.feed()) { // #feed
// if (const auto item = session().data().message(row.fullId)) {
// showSection(std::make_unique<HistoryFeed::Memento>(feed, item->position()));
// showSection(std::make_shared<HistoryFeed::Memento>(feed, item->position()));
// } else {
// showSection(std::make_unique<HistoryFeed::Memento>(feed));
// showSection(std::make_shared<HistoryFeed::Memento>(feed));
// }
}
return false;
@@ -1087,7 +1087,7 @@ void SessionController::showPeerHistory(
}
void SessionController::showSection(
std::unique_ptr<SectionMemento> &&memento,
std::shared_ptr<SectionMemento> memento,
const SectionShow &params) {
if (!params.thirdColumn && widget()->showSectionInExistingLayer(
memento.get(),

4
Telegram/SourceFiles/window/window_session_controller.h
View File

@@ -132,7 +132,7 @@ public:
Main::Session &session() const;
virtual void showSection(
std::unique_ptr<SectionMemento> &&memento,
std::shared_ptr<SectionMemento> memento,
const SectionShow &params = SectionShow()) = 0;
virtual void showBackFromStack(
const SectionShow &params = SectionShow()) = 0;
@@ -301,7 +301,7 @@ public:
bool confirmedLeaveOther = false);
void showSection(
std::unique_ptr<SectionMemento> &&memento,
std::shared_ptr<SectionMemento> memento,
const SectionShow &params = SectionShow()) override;
void showBackFromStack(
const SectionShow &params = SectionShow()) override;