mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-30 22:16:14 +00:00
Code Issues Releases Wiki Activity

Pass SessionNavigation to some boxes.

Browse Source
This commit is contained in:
John Preston
2019-07-25 20:55:11 +02:00
parent 137fa0378c
commit bacaf805b5
54 changed files with 601 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/info/info_top_bar.cpp
View File

@@ -35,11 +35,11 @@ namespace Info {
TopBar::TopBar(
QWidget *parent,
not_null<Main::Session*> session,
not_null<Window::SessionNavigation*> navigation,
const style::InfoTopBar &st,
SelectedItems &&selectedItems)
: RpWidget(parent)
, _session(session)
, _navigation(navigation)
, _st(st)
, _selectedItems(Section::MediaType::kCount) {
setAttribute(Qt::WA_OpaquePaintEvent);
@@ -519,7 +519,7 @@ MessageIdsList TopBar::collectItems() const {
) | ranges::view::transform([](auto &&item) {
return item.msgId;
}) | ranges::view::filter([&](FullMsgId msgId) {
return _session->data().message(msgId) != nullptr;
return _navigation->session().data().message(msgId) != nullptr;
}) | ranges::to_vector;
}
@@ -530,6 +530,7 @@ void TopBar::performForward() {
return;
}
Window::ShowForwardMessagesBox(
_navigation,
std::move(items),
[weak = make_weak(this)] {
if (weak) {
@@ -544,7 +545,7 @@ void TopBar::performDelete() {
_cancelSelectionClicks.fire({});
} else {
const auto box = Ui::show(Box<DeleteMessagesBox>(
_session,
&_navigation->session(),
std::move(items)));
box->setDeleteConfirmedCallback([weak = make_weak(this)] {
if (weak) {