1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00

Fix feed sizing issues

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-07-21 18:14:21 +02:00
parent dc7f6d8286
commit 3fac4adfc7
5 changed files with 53 additions and 46 deletions

View File

@@ -590,6 +590,9 @@ export default class CallView extends React.Component<IProps, IState> {
const isOnHold = this.state.isLocalOnHold || this.state.isRemoteOnHold;
const isScreensharing = this.props.call.isScreensharing();
const sidebarShown = this.state.sidebarShown;
const someoneIsScreensharing = this.props.call.getFeeds().some((feed) => {
return feed.purpose === SDPStreamMetadataPurpose.Screenshare;
});
let contentView: React.ReactNode;
let holdTransferContent;
@@ -642,7 +645,7 @@ export default class CallView extends React.Component<IProps, IState> {
let sidebar;
if (
(!isOnHold && !transfereeCall) &&
((sidebarShown && this.props.call.type === CallType.Video) || isScreensharing)
((sidebarShown && this.props.call.type === CallType.Video) || someoneIsScreensharing)
) {
sidebar = (
<CallViewSidebar
@@ -745,7 +748,7 @@ export default class CallView extends React.Component<IProps, IState> {
});
let presenting;
if (this.props.call.getFeeds().some((feed) => feed.purpose === SDPStreamMetadataPurpose.Screenshare)) {
if (someoneIsScreensharing) {
const presentingClasses = classNames({
mx_CallView_presenting: true,
mx_CallView_presenting_hidden: !this.state.controlsVisible,