matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Update sidebar behaviour

Browse Source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-07-21 16:34:21 +02:00
parent 74649f1f92
commit 337664a1b4
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/views/voip/CallView.tsx
View File

@@ -588,6 +588,8 @@ export default class CallView extends React.Component<IProps, IState> {
const avatarSize = this.props.pipMode ? 76 : 160;
const transfereeCall = CallHandler.sharedInstance().getTransfereeForCallId(this.props.call.callId);
const isOnHold = this.state.isLocalOnHold || this.state.isRemoteOnHold;
const isScreensharing = this.props.call.isScreensharing();
const sidebarShown = this.state.sidebarShown;
let contentView: React.ReactNode;
let holdTransferContent;
@@ -638,11 +640,15 @@ export default class CallView extends React.Component<IProps, IState> {
}
let sidebar;
if (!isOnHold && !transfereeCall && !this.props.pipMode && this.state.sidebarShown) {
if (
(!isOnHold && !transfereeCall && !this.props.pipMode) &&
(sidebarShown || isScreensharing)
) {
sidebar = (
<CallViewSidebar
feeds={this.state.secondaryFeeds}
call={this.props.call}
hideLocalFeeds={isScreensharing && !sidebarShown}
/>
);
}
@@ -744,7 +750,7 @@ export default class CallView extends React.Component<IProps, IState> {
mx_CallView_presenting_hidden: !this.state.controlsVisible,
});
const sharerName = this.state.primaryFeed.getMember().name;
let text = this.props.call.isScreensharing()
let text = isScreensharing
? _t("You are presenting")
: _t('%(sharerName)s is presenting', { sharerName });
if (!this.state.sidebarShown) {