Moved adding volume and mute items in group calls to separate place.

Telegram/SourceFiles/calls/calls.style

@@ -788,6 +788,7 @@ groupCallMuteCrossLine: CrossLineAnimation {
 
 groupCallMenuSpeakerArcsSkip: 1px;
 groupCallMenuVolumeSkip: 5px;
+groupCallMenuVolumeSkipSlider: defaultContinuousSlider;
 
 groupCallSpeakerArcsAnimation: ArcsAnimation {
 	fg: groupCallIconFg;

Telegram/SourceFiles/calls/calls_group_members.cpp

@@ -258,6 +258,10 @@ private:
 	[[nodiscard]] base::unique_qptr<Ui::PopupMenu> createRowContextMenu(
 		QWidget *parent,
 		not_null<PeerListRow*> row);
+	void addMuteActionsToContextMenu(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<UserData*> user,
+		not_null<Row*> row);
 	void setupListChangeViewers(not_null<GroupCall*> call);
 	void subscribeToChanges(not_null<Data::GroupCall*> real);
 	void updateRow(
@@ -1208,6 +1212,38 @@ base::unique_qptr<Ui::PopupMenu> MembersController::createRowContextMenu(
 	});
 
 	if (real->ssrc() != 0) {
+		addMuteActionsToContextMenu(result, user, real);
+	}
+
+	result->addAction(
+		tr::lng_context_view_profile(tr::now),
+		showProfile);
+	result->addAction(
+		tr::lng_context_send_message(tr::now),
+		showHistory);
+	const auto canKick = [&] {
+		if (static_cast<Row*>(row.get())->state() == Row::State::Invited) {
+			return false;
+		} else if (const auto chat = _peer->asChat()) {
+			return chat->amCreator()
+				|| (chat->canBanMembers() && !chat->admins.contains(user));
+		} else if (const auto group = _peer->asMegagroup()) {
+			return group->canRestrictUser(user);
+		}
+		return false;
+	}();
+	if (canKick) {
+		result->addAction(
+			tr::lng_context_remove_from_group(tr::now),
+			removeFromGroup);
+	}
+	return result;
+}
+
+void MembersController::addMuteActionsToContextMenu(
+		not_null<Ui::PopupMenu*> menu,
+		not_null<UserData*> user,
+		not_null<Row*> row) {
 	const auto muteString = [=] {
 		return (_peer->canManageGroupCall()
 			? tr::lng_group_call_context_mute
@@ -1237,6 +1273,13 @@ base::unique_qptr<Ui::PopupMenu> MembersController::createRowContextMenu(
 		});
 	});
 
+	const auto muteState = row->state();
+	const auto isMuted = (muteState == Row::State::Muted)
+		|| (muteState == Row::State::MutedByMe);
+
+	auto mutesFromVolume = rpl::never<bool>();
+
+	if (!isMuted) {
 		const auto call = _call.get();
 		auto otherParticipantStateValue = call
 			? call->otherParticipantStateValue(
@@ -1245,18 +1288,15 @@ base::unique_qptr<Ui::PopupMenu> MembersController::createRowContextMenu(
 				})
 			: rpl::never<Group::ParticipantState>();
 
-		const auto isMuted = (muteState == Row::State::Muted)
-			|| (muteState == Row::State::MutedByMe);
-
 		auto volumeItem = base::make_unique_q<MenuVolumeItem>(
-			result,
+			menu,
 			st::groupCallPopupMenu.menu,
 			otherParticipantStateValue,
-			real->volume(),
+			row->volume(),
 			Group::kMaxVolume,
 			isMuted);
 
-		auto mutesFromVolume = volumeItem->toggleMuteRequests();
+		mutesFromVolume = volumeItem->toggleMuteRequests();
 
 		volumeItem->toggleMuteRequests(
 		) | rpl::start_with_next([=](bool muted) {
@@ -1278,55 +1318,31 @@ base::unique_qptr<Ui::PopupMenu> MembersController::createRowContextMenu(
 			changeVolume(volume, true);
 		}, volumeItem->lifetime());
 
-		result->addAction(std::move(volumeItem));
+		menu->addAction(std::move(volumeItem));
+	};
 
 	const auto muteAction = [&]() -> QAction* {
 		if (muteState == Row::State::Invited) {
 			return nullptr;
 		}
 		auto callback = [=] {
-				const auto state = real->state();
+			const auto state = row->state();
 			const auto muted = (state == Row::State::Muted)
 				|| (state == Row::State::MutedByMe);
 			toggleMute(!muted, false);
 		};
-			return result->addAction(
+		return menu->addAction(
 			isMuted ? unmuteString() : muteString(),
 			std::move(callback));
 	}();
 
+	if (muteAction) {
 		std::move(
 			mutesFromVolume
-		) | rpl::filter([=] {
+		) | rpl::start_with_next([=](bool muted) {
-			return muteAction != nullptr;
-		}) | rpl::start_with_next([=](bool muted) {
 			muteAction->setText(muted ? unmuteString() : muteString());
-		}, result->lifetime());
+		}, menu->lifetime());
 	}
-
-	result->addAction(
-		tr::lng_context_view_profile(tr::now),
-		showProfile);
-	result->addAction(
-		tr::lng_context_send_message(tr::now),
-		showHistory);
-	const auto canKick = [&] {
-		if (static_cast<Row*>(row.get())->state() == Row::State::Invited) {
-			return false;
-		} else if (const auto chat = _peer->asChat()) {
-			return chat->amCreator()
-				|| (chat->canBanMembers() && !chat->admins.contains(user));
-		} else if (const auto group = _peer->asMegagroup()) {
-			return group->canRestrictUser(user);
-		}
-		return false;
-	}();
-	if (canKick) {
-		result->addAction(
-			tr::lng_context_remove_from_group(tr::now),
-			removeFromGroup);
-	}
-	return result;
 }
 
 std::unique_ptr<Row> MembersController::createSelfRow() {

Telegram/SourceFiles/calls/calls_volume_item.cpp

@@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/effects/cross_line.h"
 #include "ui/widgets/continuous_sliders.h"
 #include "styles/style_calls.h"
-#include "styles/style_media_player.h"
 
 #include "ui/paint/arcs.h"
 
@@ -41,7 +40,7 @@ MenuVolumeItem::MenuVolumeItem(
 , _localMuted(muted)
 , _slider(base::make_unique_q<Ui::MediaSlider>(
 	this,
-	st::mediaPlayerPanelPlayback))
+	st::groupCallMenuVolumeSkipSlider))
 , _dummyAction(new QAction(parent))
 , _st(st)
 , _stCross(st::groupCallMuteCrossLine)
@@ -88,7 +87,9 @@ MenuVolumeItem::MenuVolumeItem(
 			muteProgress);
 		p.setPen(mutePen);
 		p.setFont(_st.itemStyle.font);
-		const auto volume = std::round(_slider->value() * kMaxVolumePercent);
+		const auto volume = _localMuted
+			? 0
+			: std::round(_slider->value() * kMaxVolumePercent);
 		p.drawText(_volumeRect, u"%1%"_q.arg(volume), style::al_center);
 
 		_crossLineMute->paint(