imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Visual tweaks

Browse source
This commit is contained in:
David Baker 2020-12-01 13:44:24 +00:00
parent 5b7ad079d2
commit 4ca35fabef
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
res/css/views/voip/_CallView.scss
View file

@ -58,8 +58,8 @@ limitations under the License.
&::after { &::after {
position: absolute; position: absolute;
content: ''; content: '';
width: 20px; width: 40px;
height: 20px; height: 40px;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
@ -67,6 +67,10 @@ limitations under the License.
background-position: center; background-position: center;
background-size: cover; background-size: cover;
} }
.mx_CallView_pip &::after {
width: 30px;
height: 30px;
}
} }
.mx_BaseAvatar { .mx_BaseAvatar {
filter: blur(20px); filter: blur(20px);
@ -75,8 +79,10 @@ limitations under the License.
} }
.mx_CallView_voice_holdText { .mx_CallView_voice_holdText {
height: 16px; height: 20px;
padding-top: 10px;
color: $accent-fg-color; color: $accent-fg-color;
font-weight: bold;
.mx_AccessibleButton_hasKind { .mx_AccessibleButton_hasKind {
padding: 0px; padding: 0px;
} }
@ -124,14 +130,17 @@ limitations under the License.
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
content: ''; content: '';
width: 20px; width: 40px;
height: 20px; height: 40px;
background-image: url('$(res)/img/voip/paused.svg'); background-image: url('$(res)/img/voip/paused.svg');
background-position: center; background-position: center;
background-size: cover; background-size: cover;
} }
.mx_CallView_pip &::before {
width: 30px;
height: 30px;
}
.mx_AccessibleButton_hasKind { .mx_AccessibleButton_hasKind {
display: block;
padding: 0px; padding: 0px;
} }
} }

14
src/CallHandler.tsx
View file

@ -477,20 +477,18 @@ export default class CallHandler {
break; break;
case 'incoming_call': case 'incoming_call':
{ {
if (this.getAnyActiveCall()) {
// ignore multiple incoming calls. in future, we may want a line-1/line-2 setup.
// we avoid rejecting with "busy" in case the user wants to answer it on a different device.
// in future we could signal a "local busy" as a warning to the caller.
// see https://github.com/vector-im/vector-web/issues/1964
return;
}
// if the runtime env doesn't do VoIP, stop here. // if the runtime env doesn't do VoIP, stop here.
if (!MatrixClientPeg.get().supportsVoip()) { if (!MatrixClientPeg.get().supportsVoip()) {
return; return;
} }
const call = payload.call as MatrixCall; const call = payload.call as MatrixCall;
if (this.getCallForRoom(call.roomId)) {
// ignore multiple incoming calls to the same room
return;
}
Analytics.trackEvent('voip', 'receiveCall', 'type', call.type); Analytics.trackEvent('voip', 'receiveCall', 'type', call.type);
this.calls.set(call.roomId, call) this.calls.set(call.roomId, call)
this.setCallListeners(call); this.setCallListeners(call);