diff --git a/Telegram/SourceFiles/calls/calls_group_panel.cpp b/Telegram/SourceFiles/calls/calls_group_panel.cpp index 06e104b2a1..4d06287b30 100644 --- a/Telegram/SourceFiles/calls/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/calls_group_panel.cpp @@ -23,7 +23,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/layers/layer_manager.h" #include "ui/layers/generic_box.h" #include "ui/text/text_utilities.h" -#include "ui/toast/toast.h" #include "ui/toasts/common_toasts.h" #include "ui/special_buttons.h" #include "info/profile/info_profile_values.h" // Info::Profile::Value. @@ -292,9 +291,10 @@ Panel::Panel(not_null call) call->allowedToSpeakNotifications( ) | rpl::start_with_next([=] { if (isActive()) { - Ui::Toast::Show( - widget(), - tr::lng_group_call_can_speak_here(tr::now)); + Ui::ShowMultilineToast({ + .parentOverride = widget(), + .text = { tr::lng_group_call_can_speak_here(tr::now) }, + }); } else { const auto real = _peer->groupCall(); const auto name = (real @@ -302,13 +302,12 @@ Panel::Panel(not_null call) && !real->title().isEmpty()) ? real->title() : _peer->name; - Ui::Toast::Show(Ui::Toast::Config{ + Ui::ShowMultilineToast({ .text = tr::lng_group_call_can_speak( tr::now, lt_chat, Ui::Text::Bold(name), Ui::Text::WithEntities), - .st = &st::defaultToast, }); } }, widget()->lifetime()); @@ -537,7 +536,10 @@ void Panel::initWithCall(GroupCall *call) { _layerBg->showBox(std::move(next)); }; const auto showToast = [=](QString text) { - Ui::Toast::Show(widget(), text); + Ui::ShowMultilineToast({ + .parentOverride = widget(), + .text = { text }, + }); }; auto [shareLinkCallback, shareLinkLifetime] = ShareInviteLinkAction( _peer, @@ -658,9 +660,10 @@ void Panel::subscribeToChanges(not_null real) { const auto skip = st::groupCallRecordingMarkSkip; _recordingMark->resize(size + 2 * skip, size + 2 * skip); _recordingMark->setClickedCallback([=] { - Ui::Toast::Show( - widget(), - tr::lng_group_call_is_recorded(tr::now)); + Ui::ShowMultilineToast({ + .parentOverride = widget(), + .text = { tr::lng_group_call_is_recorded(tr::now) }, + }); }); const auto animate = [=] { const auto opaque = state->opaque; @@ -696,13 +699,14 @@ void Panel::subscribeToChanges(not_null real) { ) | rpl::distinct_until_changed( ) | rpl::start_with_next([=](bool recorded) { validateRecordingMark(recorded); - Ui::Toast::Show( - widget(), - (recorded + Ui::ShowMultilineToast({ + .parentOverride = widget(), + .text = { recorded ? tr::lng_group_call_recording_started(tr::now) : (_call && _call->recordingStoppedByMe()) ? tr::lng_group_call_recording_saved(tr::now) - : tr::lng_group_call_recording_stopped(tr::now))); + : tr::lng_group_call_recording_stopped(tr::now) }, + }); }, widget()->lifetime()); validateRecordingMark(real->recordStartDate() != 0); @@ -754,7 +758,10 @@ void Panel::chooseJoinAs() { _layerBg->showBox(std::move(next)); }; const auto showToast = [=](QString text) { - Ui::Toast::Show(widget(), text); + Ui::ShowMultilineToast({ + .parentOverride = widget(), + .text = { text }, + }); }; _joinAsProcess.start( _peer, @@ -848,28 +855,24 @@ void Panel::addMembers() { } const auto result = call->inviteUsers(users); if (const auto user = std::get_if>(&result)) { - Ui::Toast::Show( - widget(), - Ui::Toast::Config{ - .text = tr::lng_group_call_invite_done_user( - tr::now, - lt_user, - Ui::Text::Bold((*user)->firstName), - Ui::Text::WithEntities), - .st = &st::defaultToast, - }); + Ui::ShowMultilineToast({ + .parentOverride = widget(), + .text = tr::lng_group_call_invite_done_user( + tr::now, + lt_user, + Ui::Text::Bold((*user)->firstName), + Ui::Text::WithEntities), + }); } else if (const auto count = std::get_if(&result)) { if (*count > 0) { - Ui::Toast::Show( - widget(), - Ui::Toast::Config{ - .text = tr::lng_group_call_invite_done_many( - tr::now, - lt_count, - *count, - Ui::Text::RichLangValue), - .st = &st::defaultToast, - }); + Ui::ShowMultilineToast({ + .parentOverride = widget(), + .text = tr::lng_group_call_invite_done_many( + tr::now, + lt_count, + *count, + Ui::Text::RichLangValue), + }); } } else { Unexpected("Result in GroupCall::inviteUsers."); diff --git a/Telegram/SourceFiles/calls/calls_group_settings.cpp b/Telegram/SourceFiles/calls/calls_group_settings.cpp index b33ba23782..42491c72df 100644 --- a/Telegram/SourceFiles/calls/calls_group_settings.cpp +++ b/Telegram/SourceFiles/calls/calls_group_settings.cpp @@ -19,7 +19,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/input_fields.h" #include "ui/wrap/slide_wrap.h" #include "ui/text/text_utilities.h" -#include "ui/toast/toast.h" +#include "ui/toasts/common_toasts.h" #include "lang/lang_keys.h" #include "boxes/share_box.h" #include "history/history_message.h" // GetErrorTextForSending. @@ -535,9 +535,10 @@ void SettingsBox( box->getDelegate()->show(std::move(next)); }); const auto showToast = crl::guard(box, [=](QString text) { - Ui::Toast::Show( - box->getDelegate()->outerContainer(), - text); + Ui::ShowMultilineToast({ + .parentOverride = box->getDelegate()->outerContainer(), + .text = { text }, + }); }); auto [shareLinkCallback, shareLinkLifetime] = ShareInviteLinkAction( peer, @@ -572,9 +573,10 @@ void SettingsBox( } QGuiApplication::clipboard()->setText(link); if (weakBox) { - Ui::Toast::Show( - box->getDelegate()->outerContainer(), - tr::lng_create_channel_link_copied(tr::now)); + Ui::ShowMultilineToast({ + .parentOverride = box->getDelegate()->outerContainer(), + .text = { tr::lng_create_channel_link_copied(tr::now) }, + }); } return true; };