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

Disable raised-hand state in confcalls.

Browse source
This commit is contained in:
John Preston 2025-04-14 11:41:26 +04:00
parent 3098fa6855
commit 2b74ad8b5f
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/SourceFiles/calls/group/calls_group_panel.cpp
View file

@ -463,7 +463,9 @@ void Panel::initControls() {
const auto oldState = _call->muted(); const auto oldState = _call->muted();
const auto newState = (oldState == MuteState::ForceMuted) const auto newState = (oldState == MuteState::ForceMuted)
? MuteState::RaisedHand ? (_call->conference()
? MuteState::ForceMuted
: MuteState::RaisedHand)
: (oldState == MuteState::RaisedHand) : (oldState == MuteState::RaisedHand)
? MuteState::RaisedHand ? MuteState::RaisedHand
: (oldState == MuteState::Muted) : (oldState == MuteState::Muted)
@ -763,7 +765,9 @@ void Panel::setupRealMuteButtonState(not_null<Data::GroupCall*> real) {
: state == GroupCall::InstanceState::Disconnected : state == GroupCall::InstanceState::Disconnected
? Type::Connecting ? Type::Connecting
: mute == MuteState::ForceMuted : mute == MuteState::ForceMuted
? Type::ForceMuted ? (_call->conference()
? Type::ConferenceForceMuted
: Type::ForceMuted)
: mute == MuteState::RaisedHand : mute == MuteState::RaisedHand
? Type::RaisedHand ? Type::RaisedHand
: mute == MuteState::Muted : mute == MuteState::Muted

5
Telegram/SourceFiles/ui/controls/call_mute_button.cpp
View file

@ -75,7 +75,8 @@ constexpr auto kOverlapProgressRadialHide = 1.2;
constexpr auto kRadialFinishArcShift = 1200; constexpr auto kRadialFinishArcShift = 1200;
[[nodiscard]] CallMuteButtonType TypeForIcon(CallMuteButtonType type) { [[nodiscard]] CallMuteButtonType TypeForIcon(CallMuteButtonType type) {
return (type == CallMuteButtonType::Connecting) return (type == CallMuteButtonType::Connecting
|| type == CallMuteButtonType::ConferenceForceMuted)
? CallMuteButtonType::Muted ? CallMuteButtonType::Muted
: (type == CallMuteButtonType::RaisedHand) : (type == CallMuteButtonType::RaisedHand)
? CallMuteButtonType::ForceMuted ? CallMuteButtonType::ForceMuted
@ -157,6 +158,7 @@ auto Colors() {
const auto forceMutedTypes = { const auto forceMutedTypes = {
CallMuteButtonType::ForceMuted, CallMuteButtonType::ForceMuted,
CallMuteButtonType::RaisedHand, CallMuteButtonType::RaisedHand,
CallMuteButtonType::ConferenceForceMuted,
CallMuteButtonType::ScheduledCanStart, CallMuteButtonType::ScheduledCanStart,
CallMuteButtonType::ScheduledNotify, CallMuteButtonType::ScheduledNotify,
CallMuteButtonType::ScheduledSilent, CallMuteButtonType::ScheduledSilent,
@ -1040,6 +1042,7 @@ CallMuteButton::HandleMouseState CallMuteButton::HandleMouseStateFromType(
case CallMuteButtonType::ScheduledCanStart: case CallMuteButtonType::ScheduledCanStart:
case CallMuteButtonType::ScheduledNotify: case CallMuteButtonType::ScheduledNotify:
case CallMuteButtonType::ScheduledSilent: case CallMuteButtonType::ScheduledSilent:
case CallMuteButtonType::ConferenceForceMuted:
case CallMuteButtonType::ForceMuted: case CallMuteButtonType::ForceMuted:
case CallMuteButtonType::RaisedHand: case CallMuteButtonType::RaisedHand:
return HandleMouseState::Enabled; return HandleMouseState::Enabled;

1
Telegram/SourceFiles/ui/controls/call_mute_button.h
View file

@ -39,6 +39,7 @@ enum class CallMuteButtonType {
Muted, Muted,
ForceMuted, ForceMuted,
RaisedHand, RaisedHand,
ConferenceForceMuted,
ScheduledCanStart, ScheduledCanStart,
ScheduledSilent, ScheduledSilent,
ScheduledNotify, ScheduledNotify,