From b18d665fbe6c721935d5849c4f1277af84835572 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sun, 6 Mar 2022 08:28:21 +0300 Subject: [PATCH] Delegated display of DeleteLinkBox to caller. --- .../boxes/peers/edit_peer_invite_link.cpp | 13 +++++-------- .../SourceFiles/boxes/peers/edit_peer_invite_link.h | 2 +- .../boxes/peers/edit_peer_invite_links.cpp | 4 +++- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp index 85c9483721..949c561056 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.cpp @@ -357,7 +357,9 @@ void Controller::addHeaderBlock(not_null container) { EditLink(_peer, _data.current()); }); const auto deleteLink = crl::guard(weak, [=] { - DeleteLink(_peer, admin, link); + delegate()->peerListShowBox( + DeleteLinkBox(_peer, admin, link), + Ui::LayerOption::KeepOther); }); const auto createMenu = [=] { @@ -1276,7 +1278,7 @@ void RevokeLink( Ui::LayerOption::KeepOther); } -void DeleteLink( +object_ptr DeleteLinkBox( not_null peer, not_null admin, const QString &link) { @@ -1287,12 +1289,7 @@ void DeleteLink( link, std::move(close)); }; - Ui::show( - Ui::MakeConfirmBox({ - tr::lng_group_invite_delete_sure(), - sure - }), - Ui::LayerOption::KeepOther); + return Ui::MakeConfirmBox({ tr::lng_group_invite_delete_sure(), sure }); } object_ptr ShowInviteLinkBox( diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h index 744dfb2667..4dd5b9e384 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_link.h @@ -44,7 +44,7 @@ void RevokeLink( void EditLink( not_null peer, const Api::InviteLink &data); -void DeleteLink( +[[nodiscard]] object_ptr DeleteLinkBox( not_null peer, not_null admin, const QString &link); diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp index 3db292ce76..99a003b298 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_invite_links.cpp @@ -579,7 +579,9 @@ base::unique_qptr LinksController::createRowContextMenu( st::popupMenuWithIcons); if (data.revoked) { result->addAction(tr::lng_group_invite_context_delete(tr::now), [=] { - DeleteLink(_peer, _admin, link); + delegate()->peerListShowBox( + DeleteLinkBox(_peer, _admin, link), + Ui::LayerOption::KeepOther); }, &st::menuIconDelete); } else { result->addAction(tr::lng_group_invite_context_copy(tr::now), [=] {