diff --git a/Telegram/SourceFiles/calls/calls_group_members.cpp b/Telegram/SourceFiles/calls/calls_group_members.cpp index 08846dc0ed..94d578ca79 100644 --- a/Telegram/SourceFiles/calls/calls_group_members.cpp +++ b/Telegram/SourceFiles/calls/calls_group_members.cpp @@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "calls/calls_group_call.h" #include "calls/calls_group_common.h" +#include "calls/calls_group_menu.h" #include "calls/calls_volume_item.h" #include "data/data_channel.h" #include "data/data_chat.h" @@ -1621,9 +1622,10 @@ base::unique_qptr MembersController::createRowContextMenu( return false; }(); if (canKick) { - result->addAction( + result->addAction(MakeAttentionAction( + result->menu(), tr::lng_group_call_context_remove(tr::now), - removeFromVoiceChat); + removeFromVoiceChat)); } } if (result->empty()) { diff --git a/Telegram/SourceFiles/calls/calls_group_menu.cpp b/Telegram/SourceFiles/calls/calls_group_menu.cpp index 7f78ef26ce..43c6205cea 100644 --- a/Telegram/SourceFiles/calls/calls_group_menu.cpp +++ b/Telegram/SourceFiles/calls/calls_group_menu.cpp @@ -517,16 +517,10 @@ base::unique_qptr MakeRecordingAction( base::unique_qptr MakeFinishAction( not_null menu, Fn callback) { - return base::make_unique_q( + return MakeAttentionAction( menu, - st::groupCallFinishMenu, - Ui::Menu::CreateAction( - menu, - tr::lng_group_call_end(tr::now), - std::move(callback)), - nullptr, - nullptr); - + tr::lng_group_call_end(tr::now), + std::move(callback)); } } // namespace @@ -675,6 +669,21 @@ void FillMenu( BoxContext::GroupCallPanel)); } })); +} + +base::unique_qptr MakeAttentionAction( + not_null menu, + const QString &text, + Fn callback) { + return base::make_unique_q( + menu, + st::groupCallFinishMenu, + Ui::Menu::CreateAction( + menu, + text, + std::move(callback)), + nullptr, + nullptr); } diff --git a/Telegram/SourceFiles/calls/calls_group_menu.h b/Telegram/SourceFiles/calls/calls_group_menu.h index 1d4a7eff85..7eeed21fc4 100644 --- a/Telegram/SourceFiles/calls/calls_group_menu.h +++ b/Telegram/SourceFiles/calls/calls_group_menu.h @@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #pragma once #include "base/object_ptr.h" +#include "base/unique_qptr.h" namespace Ui { class DropdownMenu; @@ -15,6 +16,11 @@ class GenericBox; class BoxContent; } // namespace Ui +namespace Ui::Menu { +class ItemBase; +class Menu; +} // namespace Ui::Menu + namespace Calls { class GroupCall; } // namespace Calls @@ -45,4 +51,9 @@ void FillMenu( Fn chooseJoinAs, Fn)> showBox); +[[nodiscard]] base::unique_qptr MakeAttentionAction( + not_null menu, + const QString &text, + Fn callback); + } // namespace Calls::Group