mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-23 19:25:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

Show sidebar in PiP mode

Browse source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-07-21 17:45:21 +02:00
parent 0a8067506f
commit dc7f6d8286
No known key found for this signature in database
GPG key ID: 55C211A1226CB17D
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/css/views/voip/_CallViewSidebar.scss
View file

@ -23,4 +23,9 @@ limitations under the License.
min-width: 160px; // To match .mx_VideoFeed_voice
display: flex;
flex-direction: column-reverse;
&.mx_CallViewSidebar_pipMode {
top: 16px;
bottom: unset;
}
}

5
src/components/views/voip/CallView.tsx
View file

@ -641,14 +641,15 @@ export default class CallView extends React.Component<IProps, IState> {
let sidebar;
if (
(!isOnHold && !transfereeCall && !this.props.pipMode) &&
(sidebarShown || isScreensharing)
(!isOnHold && !transfereeCall) &&
((sidebarShown && this.props.call.type === CallType.Video) || isScreensharing)
) {
sidebar = (
<CallViewSidebar
feeds={this.state.secondaryFeeds}
call={this.props.call}
hideLocalFeeds={isScreensharing && !sidebarShown}
pipMode={this.props.pipMode}
/>
);
}

8
src/components/views/voip/CallViewSidebar.tsx
View file

@ -18,11 +18,13 @@ import React from "react";
import { MatrixCall } from "matrix-js-sdk/src/webrtc/call";
import { CallFeed } from "matrix-js-sdk/src/webrtc/callFeed";
import VideoFeed from "./VideoFeed";
import classNames from "classnames";
interface IProps {
feeds: Array<CallFeed>;
call: MatrixCall;
hideLocalFeeds: boolean;
pipMode: boolean;
}
export default class CallViewSidebar extends React.Component<IProps> {
@ -40,8 +42,12 @@ export default class CallViewSidebar extends React.Component<IProps> {
);
});
const className = classNames("mx_CallViewSidebar", {
mx_CallViewSidebar_pipMode: this.props.pipMode,
});
return (
<div className="mx_CallViewSidebar">
<div className={className}>
{ feeds }
</div>
);