From 9a6785147951924edc266f5cdcf827c1b748c950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sat, 12 Jun 2021 14:01:09 +0200
Subject: [PATCH] Hide feeds with muted video in certain cases and fix colors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/views/voip/_VideoFeed.scss            | 2 +-
 src/components/views/voip/CallView.tsx        | 1 +
 src/components/views/voip/CallViewSidebar.tsx | 3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/res/css/views/voip/_VideoFeed.scss b/res/css/views/voip/_VideoFeed.scss
index dd939d8ea1..40d21ffcc2 100644
--- a/res/css/views/voip/_VideoFeed.scss
+++ b/res/css/views/voip/_VideoFeed.scss
@@ -38,7 +38,7 @@ limitations under the License.
     margin-bottom: 12px;
 
     &.mx_VideoFeed_voice {
-        background-color: #17191c; // Same on both themes
+        background-color: $inverted-bg-color;
 
         display: flex;
         align-items: center;
diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx
index 5e33ca10e1..ce2e4dabe9 100644
--- a/src/components/views/voip/CallView.tsx
+++ b/src/components/views/voip/CallView.tsx
@@ -614,6 +614,7 @@ export default class CallView extends React.Component<IProps, IState> {
                 <CallViewSidebar
                     feeds={this.state.secondaryFeeds}
                     call={this.props.call}
+                    hideFeedsWithMutedVideo={!this.state.primaryFeed || this.state.primaryFeed?.isVideoMuted()}
                 />
             );
         }
diff --git a/src/components/views/voip/CallViewSidebar.tsx b/src/components/views/voip/CallViewSidebar.tsx
index ce9f3335ae..a2524e1c39 100644
--- a/src/components/views/voip/CallViewSidebar.tsx
+++ b/src/components/views/voip/CallViewSidebar.tsx
@@ -23,11 +23,14 @@ import VideoFeed from "./VideoFeed";
 interface IProps {
     feeds: Array<CallFeed>;
     call: MatrixCall;
+    hideFeedsWithMutedVideo: boolean;
 }
 
 export default class CallViewSidebar extends React.Component<IProps> {
     render() {
         const feeds = this.props.feeds.map((feed) => {
+            if (feed.isVideoMuted() && this.props.hideFeedsWithMutedVideo) return;
+
             return (
                 <VideoFeed
                     key={feed.stream.id}