Added cross line animation to mute button in Calls::TopBar.

Telegram/SourceFiles/calls/calls.style

@@ -663,3 +663,11 @@ groupCallBoxLabel: FlatLabel(boxLabel) {
 
 groupCallRowBlobMinRadius: 28px;
 groupCallRowBlobMaxRadius: 30px;
+
+callTopBarMuteCrossLine: CrossLineAnimation {
+	fg: callBarFg;
+	icon: icon {{ "calls/call_record_active", callBarFg }};
+	startPosition: point(11px, 8px);
+	endPosition: point(26px, 23px);
+	stroke: 2px;
+}

Telegram/SourceFiles/calls/calls_top_bar.cpp

@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "calls/calls_top_bar.h"
 
+#include "ui/effects/cross_line.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/chat/group_call_bar.h" // Ui::GroupCallBarContent.
@@ -99,6 +100,52 @@ void DebugInfoBox::updateText() {
 
 } // namespace
 
+class Mute final : public Ui::IconButton {
+public:
+	Mute(QWidget *parent, const style::IconButton &st)
+	: Ui::IconButton(parent, st)
+	, _st(st)
+	, _crossLineMuteAnimation(st::callTopBarMuteCrossLine) {
+		resize(_st.width, _st.height);
+		installEventFilter(this);
+	}
+
+	void setProgress(float64 progress) {
+		if (_progress == progress) {
+			return;
+		}
+		_progress = progress;
+		update();
+	}
+
+	void setRippleColorOverride(const style::color *colorOverride) {
+		_rippleColorOverride = colorOverride;
+	}
+
+protected:
+	bool eventFilter(QObject *object, QEvent *event) {
+		if (event->type() == QEvent::Paint) {
+			Painter p(this);
+			paintRipple(
+				p,
+				_st.rippleAreaPosition.x(),
+				_st.rippleAreaPosition.y(),
+				_rippleColorOverride ? &(*_rippleColorOverride)->c : nullptr);
+			_crossLineMuteAnimation.paint(p, _st.iconPosition, _progress);
+			return true;
+		}
+		return QObject::eventFilter(object, event);
+	}
+
+private:
+	float64 _progress = 0.;
+
+	const style::IconButton &_st;
+	Ui::CrossLineAnimation _crossLineMuteAnimation;
+	const style::color *_rippleColorOverride = nullptr;
+
+};
+
 TopBar::TopBar(
 	QWidget *parent,
 	const base::weak_ptr<Call> &call)
@@ -153,53 +200,62 @@ void TopBar::initControls() {
 		}
 	});
 
-	using namespace rpl::mappers;
+	const auto mapToState = [](bool muted) {
+		return muted ? MuteState::Muted : MuteState::Active;
+	};
+	const auto fromState = _mute->lifetime().make_state<MuteState>(
+		_call ? mapToState(_call->muted()) : _groupCall->muted());
 	auto muted = _call
-		? _call->mutedValue()
+		? _call->mutedValue() | rpl::map(mapToState)
-		: (_groupCall->mutedValue() | rpl::map(_1 != MuteState::Active));
+		: _groupCall->mutedValue();
 	std::move(
 		muted
-	) | rpl::start_with_next([=](bool muted) {
+	) | rpl::start_with_next([=](MuteState state) {
-		setMuted(muted);
+		setMuted(state != MuteState::Active);
 		update();
-	}, lifetime());
 
-	if (const auto group = _groupCall.get()) {
+		const auto isForceMuted = (state == MuteState::ForceMuted);
-		const auto fromState = _mute->lifetime().make_state<MuteState>(
+		if (isForceMuted) {
-			group->muted());
+			_mute->clearState();
+		}
+		_mute->setAttribute(
+			Qt::WA_TransparentForMouseEvents,
+			isForceMuted);
 
-		group->mutedValue(
+		const auto to = 1.;
-		) | rpl::start_with_next([=](MuteState state) {
+		const auto from = _switchStateAnimation.animating()
-			if (state == MuteState::ForceMuted) {
+			? (to - _switchStateAnimation.value(0.))
-				_mute->clearState();
+			: 0.;
-			}
+		const auto fromMuted = *fromState;
-			_mute->setAttribute(
+		const auto toMuted = state;
-				Qt::WA_TransparentForMouseEvents,
+		*fromState = state;
-				(state == MuteState::ForceMuted));
 
-			const auto to = 1.;
+		const auto crossFrom = (fromMuted != MuteState::Active) ? 1. : 0.;
-			const auto from = _switchStateAnimation.animating()
+		const auto crossTo = (toMuted != MuteState::Active) ? 1. : 0.;
-				? (to - _switchStateAnimation.value(0.))
-				: 0.;
-			const auto fromMuted = *fromState;
-			const auto toMuted = state;
-			*fromState = state;
 
-			auto animationCallback = [=](float64 value) {
+		auto animationCallback = [=](float64 value) {
+			if (_groupCall) {
 				_groupBrush = QBrush(
 					_gradients.gradient(fromMuted, toMuted, value));
 				update();
-			};
+			}
 
-			_switchStateAnimation.stop();
+			const auto crossProgress = (crossFrom == crossTo)
-			const auto duration = (to - from) * kSwitchStateDuration;
+				? crossTo
-			_switchStateAnimation.start(
+				: (crossFrom + float64(crossTo - crossFrom) * value);
-				std::move(animationCallback),
+			_mute->setProgress(crossProgress);
-				from,
+		};
-				to,
-				duration);
-		}, _mute->lifetime());
 
+		_switchStateAnimation.stop();
+		const auto duration = (to - from) * kSwitchStateDuration;
+		_switchStateAnimation.start(
+			std::move(animationCallback),
+			from,
+			to,
+			duration);
+	}, _mute->lifetime());
+
+	if (const auto group = _groupCall.get()) {
 		subscribeToMembersChanges(group);
 	}
 
@@ -294,12 +350,8 @@ void TopBar::setInfoLabels() {
 }
 
 void TopBar::setMuted(bool mute) {
-	_mute->setIconOverride(mute ? &st::callBarUnmuteIcon : nullptr);
+	_mute->setRippleColorOverride(&st::shadowFg);
-	const auto color = _groupCall
+	_hangup->setRippleColorOverride(&st::shadowFg);
-		? &st::shadowFg
-		: (mute ? &st::callBarUnmuteRipple : nullptr);
-	_mute->setRippleColorOverride(color);
-	_hangup->setRippleColorOverride(color);
 	_muted = mute;
 }
 

Telegram/SourceFiles/calls/calls_top_bar.h

@@ -30,6 +30,7 @@ namespace Calls {
 class Call;
 class GroupCall;
 class SignalBars;
+class Mute;
 enum class MuteState;
 
 class TopBar : public Ui::RpWidget {
@@ -69,7 +70,7 @@ private:
 	object_ptr<Ui::FlatLabel> _fullInfoLabel;
 	object_ptr<Ui::FlatLabel> _shortInfoLabel;
 	object_ptr<Ui::LabelSimple> _hangupLabel;
-	object_ptr<Ui::IconButton> _mute;
+	object_ptr<Mute> _mute;
 	object_ptr<Ui::AbstractButton> _info;
 	object_ptr<Ui::IconButton> _hangup;