From 380a0d1f866b73fabb4cccace2fcd79ddb4dcc01 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 23 Apr 2021 20:54:51 +0400
Subject: [PATCH] Improve wide video layout.

---
 Telegram/SourceFiles/calls/calls.style                 | 4 ++--
 Telegram/SourceFiles/calls/group/calls_group_call.cpp  | 3 ++-
 Telegram/SourceFiles/calls/group/calls_group_panel.cpp | 2 +-
 Telegram/ThirdParty/tgcalls                            | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Telegram/SourceFiles/calls/calls.style b/Telegram/SourceFiles/calls/calls.style
index 7588e73873..829b0a83f1 100644
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -1022,5 +1022,5 @@ desktopCaptureSourceSkip: 12px;
 groupCallNarrowSkip: 9px;
 groupCallNarrowRowSkip: 8px;
 groupCallNarrowSize: size(90px, 90px);
-groupCallWideModeWidthMin: 800px;
-groupCallWideModeSize: size(960px, 520px);
+groupCallWideModeWidthMin: 520px;
+groupCallWideModeSize: size(720px, 480px);
diff --git a/Telegram/SourceFiles/calls/group/calls_group_call.cpp b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
index 667bdc18a6..5978429839 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
@@ -475,7 +475,8 @@ void GroupCall::subscribeToReal(not_null<Data::GroupCall*> real) {
 				_videoStreamLarge = bestWithVideoSsrc;
 			}
 		} else if ((nowSpeaking || nowSounding)
-			&& (data.now->ssrc != videoLargeSsrc)) {
+			&& (data.now->ssrc != videoLargeSsrc)
+			&& _videoStreamSsrcs.contains(data.now->ssrc)) {
 			const auto i = ranges::find(
 				participants,
 				videoLargeSsrc,
diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
index 103ddf7cac..54db5465bf 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -1561,7 +1561,7 @@ void Panel::updateMembersGeometry() {
 		_pinnedVideo->setGeometry(
 			pinnedLeft,
 			membersTop,
-			widget()->width() - pinnedLeft,
+			widget()->width() - pinnedLeft - st::groupCallNarrowSkip,
 			availableHeight);
 	} else {
 		const auto membersWidthAvailable = widget()->width()
diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls
index 0f608993f7..4a944bc29e 160000
--- a/Telegram/ThirdParty/tgcalls
+++ b/Telegram/ThirdParty/tgcalls
@@ -1 +1 @@
-Subproject commit 0f608993f7a5c9af093f6a7bf21c3b4cd0735ecc
+Subproject commit 4a944bc29ec308556471a1533874a68dd95a9ba3