mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-07 07:33:52 +02:00
Disable raised-hand state in confcalls.
This commit is contained in:
parent
3098fa6855
commit
2b74ad8b5f
3 changed files with 11 additions and 3 deletions
|
@ -463,7 +463,9 @@ void Panel::initControls() {
|
|||
|
||||
const auto oldState = _call->muted();
|
||||
const auto newState = (oldState == MuteState::ForceMuted)
|
||||
? MuteState::RaisedHand
|
||||
? (_call->conference()
|
||||
? MuteState::ForceMuted
|
||||
: MuteState::RaisedHand)
|
||||
: (oldState == MuteState::RaisedHand)
|
||||
? MuteState::RaisedHand
|
||||
: (oldState == MuteState::Muted)
|
||||
|
@ -763,7 +765,9 @@ void Panel::setupRealMuteButtonState(not_null<Data::GroupCall*> real) {
|
|||
: state == GroupCall::InstanceState::Disconnected
|
||||
? Type::Connecting
|
||||
: mute == MuteState::ForceMuted
|
||||
? Type::ForceMuted
|
||||
? (_call->conference()
|
||||
? Type::ConferenceForceMuted
|
||||
: Type::ForceMuted)
|
||||
: mute == MuteState::RaisedHand
|
||||
? Type::RaisedHand
|
||||
: mute == MuteState::Muted
|
||||
|
|
|
@ -75,7 +75,8 @@ constexpr auto kOverlapProgressRadialHide = 1.2;
|
|||
constexpr auto kRadialFinishArcShift = 1200;
|
||||
|
||||
[[nodiscard]] CallMuteButtonType TypeForIcon(CallMuteButtonType type) {
|
||||
return (type == CallMuteButtonType::Connecting)
|
||||
return (type == CallMuteButtonType::Connecting
|
||||
|| type == CallMuteButtonType::ConferenceForceMuted)
|
||||
? CallMuteButtonType::Muted
|
||||
: (type == CallMuteButtonType::RaisedHand)
|
||||
? CallMuteButtonType::ForceMuted
|
||||
|
@ -157,6 +158,7 @@ auto Colors() {
|
|||
const auto forceMutedTypes = {
|
||||
CallMuteButtonType::ForceMuted,
|
||||
CallMuteButtonType::RaisedHand,
|
||||
CallMuteButtonType::ConferenceForceMuted,
|
||||
CallMuteButtonType::ScheduledCanStart,
|
||||
CallMuteButtonType::ScheduledNotify,
|
||||
CallMuteButtonType::ScheduledSilent,
|
||||
|
@ -1040,6 +1042,7 @@ CallMuteButton::HandleMouseState CallMuteButton::HandleMouseStateFromType(
|
|||
case CallMuteButtonType::ScheduledCanStart:
|
||||
case CallMuteButtonType::ScheduledNotify:
|
||||
case CallMuteButtonType::ScheduledSilent:
|
||||
case CallMuteButtonType::ConferenceForceMuted:
|
||||
case CallMuteButtonType::ForceMuted:
|
||||
case CallMuteButtonType::RaisedHand:
|
||||
return HandleMouseState::Enabled;
|
||||
|
|
|
@ -39,6 +39,7 @@ enum class CallMuteButtonType {
|
|||
Muted,
|
||||
ForceMuted,
|
||||
RaisedHand,
|
||||
ConferenceForceMuted,
|
||||
ScheduledCanStart,
|
||||
ScheduledSilent,
|
||||
ScheduledNotify,
|
||||
|
|
Loading…
Add table
Reference in a new issue