OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Hide feeds with muted video in certain cases and fix colors 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2021-06-12 14:01:09 +02:00
parent 6ae1f533e9
commit 9a67851479
No known key found for this signature in database
GPG Key ID: 9760693FDD98A790
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/css/views/voip/_VideoFeed.scss
View File

@ -38,7 +38,7 @@ limitations under the License.
margin-bottom: 12px; margin-bottom: 12px;
&.mx_VideoFeed_voice { &.mx_VideoFeed_voice {
background-color: #17191c; // Same on both themes background-color: $inverted-bg-color;
display: flex; display: flex;
align-items: center; align-items: center;

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

@ -614,6 +614,7 @@ export default class CallView extends React.Component<IProps, IState> {
<CallViewSidebar <CallViewSidebar
feeds={this.state.secondaryFeeds} feeds={this.state.secondaryFeeds}
call={this.props.call} call={this.props.call}
hideFeedsWithMutedVideo={!this.state.primaryFeed || this.state.primaryFeed?.isVideoMuted()}
/> />
); );
} }

3
src/components/views/voip/CallViewSidebar.tsx
View File

@ -23,11 +23,14 @@ import VideoFeed from "./VideoFeed";
interface IProps { interface IProps {
feeds: Array<CallFeed>; feeds: Array<CallFeed>;
call: MatrixCall; call: MatrixCall;
hideFeedsWithMutedVideo: boolean;
} }
export default class CallViewSidebar extends React.Component<IProps> { export default class CallViewSidebar extends React.Component<IProps> {
render() { render() {
const feeds = this.props.feeds.map((feed) => { const feeds = this.props.feeds.map((feed) => {
if (feed.isVideoMuted() && this.props.hideFeedsWithMutedVideo) return;
return ( return (
<VideoFeed <VideoFeed
key={feed.stream.id} key={feed.stream.id}