mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fix PiP and call settings in reconnecting calls

Browse source
This commit is contained in:
ayumi-signal 2024-07-02 08:03:02 -07:00 committed by GitHub
parent ea37980fc3
commit 3ff9b87a22
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
stylesheets/_modules.scss
View file

@ -4258,6 +4258,10 @@ button.module-image__border-overlay:focus {
} }
} }
&__controls {
z-index: $z-index-above-above-base;
}
&__controls--fadeIn { &__controls--fadeIn {
@include module-ongoing-call__controls--fade-in; @include module-ongoing-call__controls--fade-in;
} }
@ -4271,7 +4275,6 @@ button.module-image__border-overlay:focus {
position: absolute; position: absolute;
top: calc(32px + var(--title-bar-drag-area-height)); top: calc(32px + var(--title-bar-drag-area-height));
inset-inline-end: 0; inset-inline-end: 0;
z-index: $z-index-above-above-base;
display: flex; display: flex;
&__button { &__button {

1
ts/components/CallScreen.tsx
View file

@ -491,6 +491,7 @@ export function CallScreen({
const controlsFadedOut = !showControls && !isAudioOnly && isConnected; const controlsFadedOut = !showControls && !isAudioOnly && isConnected;
const controlsFadeClass = classNames({ const controlsFadeClass = classNames({
'module-ongoing-call__controls': true,
'module-ongoing-call__controls--fadeIn': 'module-ongoing-call__controls--fadeIn':
(showControls || isAudioOnly) && !isConnected, (showControls || isAudioOnly) && !isConnected,
'module-ongoing-call__controls--fadeOut': controlsFadedOut, 'module-ongoing-call__controls--fadeOut': controlsFadedOut,

3
ts/util/callingIsReconnecting.ts
View file

@ -7,10 +7,11 @@ import {
GroupCallConnectionState, GroupCallConnectionState,
} from '../types/Calling'; } from '../types/Calling';
import type { ActiveCallType } from '../types/Calling'; import type { ActiveCallType } from '../types/Calling';
import { isGroupOrAdhocActiveCall } from './isGroupOrAdhocCall';
export function isReconnecting(activeCall: ActiveCallType): boolean { export function isReconnecting(activeCall: ActiveCallType): boolean {
return ( return (
(activeCall.callMode === CallMode.Group && (isGroupOrAdhocActiveCall(activeCall) &&
activeCall.connectionState === GroupCallConnectionState.Reconnecting) || activeCall.connectionState === GroupCallConnectionState.Reconnecting) ||
(activeCall.callMode === CallMode.Direct && (activeCall.callMode === CallMode.Direct &&
activeCall.callState === CallState.Reconnecting) activeCall.callState === CallState.Reconnecting)