Remove secondary call avatar

and change 'paused' to 'on hold'
This commit is contained in:
David Baker 2020-12-18 19:40:57 +00:00
parent 7cc00faeb3
commit f325df3b6a
3 changed files with 2 additions and 42 deletions

View file

@ -116,31 +116,6 @@ limitations under the License.
*/ */
} }
.mx_CallView_voice_secondaryAvatarContainer {
border-radius: 2000px;
overflow: hidden;
position: relative;
/*
&::after {
position: absolute;
content: '';
width: 100%;
height: 100%;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
background-color: rgba(0, 0, 0, 0.6);
background-image: url('$(res)/img/voip/paused.svg');
background-position: center;
background-size: 40px;
background-repeat: no-repeat;
}
.mx_CallView_pip &::after {
background-size: 24px;
}
*/
}
.mx_CallView_voice_holdText { .mx_CallView_voice_holdText {
height: 20px; height: 20px;
padding-top: 20px; padding-top: 20px;

View file

@ -480,20 +480,6 @@ export default class CallView extends React.Component<IProps, IState> {
mx_CallView_voice: true, mx_CallView_voice: true,
mx_CallView_voice_hold: isOnHold, mx_CallView_voice_hold: isOnHold,
}); });
let secondaryCallAvatar: ReactNode;
if (this.props.secondaryCall) {
const secAvatarSize = this.props.pipMode ? 40 : 100;
secondaryCallAvatar = <div className="mx_CallView_voice_secondaryAvatarContainer"
style={{width: secAvatarSize, height: secAvatarSize}}
>
<RoomAvatar
room={secCallRoom}
height={secAvatarSize}
width={secAvatarSize}
/>
</div>;
}
contentView = <div className={classes} onMouseMove={this.onMouseMove}> contentView = <div className={classes} onMouseMove={this.onMouseMove}>
<div className="mx_CallView_voice_avatarsContainer"> <div className="mx_CallView_voice_avatarsContainer">
@ -504,7 +490,6 @@ export default class CallView extends React.Component<IProps, IState> {
width={avatarSize} width={avatarSize}
/> />
</div> </div>
{secondaryCallAvatar}
</div> </div>
<div className="mx_CallView_voice_holdText">{onHoldText}</div> <div className="mx_CallView_voice_holdText">{onHoldText}</div>
{callControls} {callControls}
@ -548,7 +533,7 @@ export default class CallView extends React.Component<IProps, IState> {
<AccessibleButton element='span' onClick={this.onSecondaryRoomAvatarClick}> <AccessibleButton element='span' onClick={this.onSecondaryRoomAvatarClick}>
<RoomAvatar room={secCallRoom} height={16} width={16} /> <RoomAvatar room={secCallRoom} height={16} width={16} />
<span className="mx_CallView_secondaryCall_roomName"> <span className="mx_CallView_secondaryCall_roomName">
{_t("%(name)s paused", { name: secCallRoom.name })} {_t("%(name)s on hold", { name: secCallRoom.name })}
</span> </span>
</AccessibleButton> </AccessibleButton>
</span>; </span>;

View file

@ -858,7 +858,7 @@
"Voice Call": "Voice Call", "Voice Call": "Voice Call",
"Fill Screen": "Fill Screen", "Fill Screen": "Fill Screen",
"Return to call": "Return to call", "Return to call": "Return to call",
"%(name)s paused": "%(name)s paused", "%(name)s on hold": "%(name)s on hold",
"Unknown caller": "Unknown caller", "Unknown caller": "Unknown caller",
"Incoming voice call": "Incoming voice call", "Incoming voice call": "Incoming voice call",
"Incoming video call": "Incoming video call", "Incoming video call": "Incoming video call",