void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Provided parent to report toasts.

Browse source
This commit is contained in:
23rd 2022-04-17 14:47:32 +03:00 • committed by John Preston
parent af0a2f182c
commit 2e9e3b3751
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Telegram/SourceFiles/api/api_report.cpp
View file

@ -38,6 +38,7 @@ MTPreportReason ReasonToTL(const Ui::ReportReason &reason) {
} // namespace } // namespace
void SendReport( void SendReport(
not_null<QWidget*> toastParent,
not_null<PeerData*> peer, not_null<PeerData*> peer,
Ui::ReportReason reason, Ui::ReportReason reason,
const QString &comment, const QString &comment,
@ -48,7 +49,7 @@ void SendReport(
ReasonToTL(reason), ReasonToTL(reason),
MTP_string(comment) MTP_string(comment)
)).done([=] { )).done([=] {
Ui::Toast::Show(tr::lng_report_thanks(tr::now)); Ui::Toast::Show(toastParent, tr::lng_report_thanks(tr::now));
}).send(); }).send();
} else { } else {
auto apiIds = QVector<MTPint>(); auto apiIds = QVector<MTPint>();
@ -62,7 +63,7 @@ void SendReport(
ReasonToTL(reason), ReasonToTL(reason),
MTP_string(comment) MTP_string(comment)
)).done([=] { )).done([=] {
Ui::Toast::Show(tr::lng_report_thanks(tr::now)); Ui::Toast::Show(toastParent, tr::lng_report_thanks(tr::now));
}).send(); }).send();
} }
} }

1
Telegram/SourceFiles/api/api_report.h
View file

@ -16,6 +16,7 @@ enum class ReportReason;
namespace Api { namespace Api {
void SendReport( void SendReport(
not_null<QWidget*> toastParent,
not_null<PeerData*> peer, not_null<PeerData*> peer,
Ui::ReportReason reason, Ui::ReportReason reason,
const QString &comment, const QString &comment,

10
Telegram/SourceFiles/boxes/report_messages_box.cpp
View file

@ -24,7 +24,8 @@ object_ptr<Ui::BoxContent> ReportItemsBox(
Ui::BoxShow(box).showBox(Box([=](not_null<Ui::GenericBox*> box) { Ui::BoxShow(box).showBox(Box([=](not_null<Ui::GenericBox*> box) {
const auto show = Ui::BoxShow(box); const auto show = Ui::BoxShow(box);
Ui::ReportDetailsBox(box, [=](const QString &text) { Ui::ReportDetailsBox(box, [=](const QString &text) {
Api::SendReport(peer, reason, text, ids); const auto toastParent = show.toastParent();
Api::SendReport(toastParent, peer, reason, text, ids);
show.hideLayer(); show.hideLayer();
}); });
})); }));
@ -44,7 +45,12 @@ void ShowReportPeerBox(
const auto chosen = [=](Ui::ReportReason reason) { const auto chosen = [=](Ui::ReportReason reason) {
const auto send = [=](const QString &text) { const auto send = [=](const QString &text) {
window->clearChooseReportMessages(); window->clearChooseReportMessages();
Api::SendReport(peer, reason, text, std::move(state->ids)); Api::SendReport(
Window::Show(window).toastParent(),
peer,
reason,
text,
std::move(state->ids));
if (const auto strong = state->reasonBox.data()) { if (const auto strong = state->reasonBox.data()) {
strong->closeBox(); strong->closeBox();
} }

3
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -3885,7 +3885,8 @@ void HistoryWidget::reportSelectedMessages() {
clearSelected(); clearSelected();
controller()->clearChooseReportMessages(); controller()->clearChooseReportMessages();
} }
Api::SendReport(peer, reason, text, ids); const auto toastParent = Window::Show(controller()).toastParent();
Api::SendReport(toastParent, peer, reason, text, ids);
box->closeBox(); box->closeBox();
}); });
})); }));