From 4d139b2991fbf4d06b2dab091a8e7efa08973ffa Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Thu, 7 Jul 2022 15:17:49 +0200
Subject: [PATCH] Fix bad glowing on speaking participants. Go to the end of
 conference list going into it or when changing filter. Update SDK.

---
 linphone-app/ui/modules/Linphone/Sticker/AvatarSticker.qml | 7 +++++--
 linphone-app/ui/modules/Linphone/Sticker/CameraSticker.qml | 6 +++++-
 .../ui/modules/Linphone/Sticker/DecorationSticker.qml      | 4 +++-
 linphone-app/ui/modules/Linphone/Sticker/Sticker.qml       | 2 ++
 .../ui/views/App/Calls/VideoConferenceActiveSpeaker.qml    | 3 ++-
 linphone-app/ui/views/App/Main/Conferences.qml             | 2 ++
 linphone-sdk                                               | 2 +-
 7 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/linphone-app/ui/modules/Linphone/Sticker/AvatarSticker.qml b/linphone-app/ui/modules/Linphone/Sticker/AvatarSticker.qml
index fcd36f504..38b50ecc0 100644
--- a/linphone-app/ui/modules/Linphone/Sticker/AvatarSticker.qml
+++ b/linphone-app/ui/modules/Linphone/Sticker/AvatarSticker.qml
@@ -38,11 +38,14 @@ DecorationSticker {
 	_isPreview: isPreview
 	_showCloseButton: showCloseButton
 	_showActiveSpeakerOverlay: showActiveSpeakerOverlay
-		
+	
+	clip:false
+	radius: AvatarStickerStyle.radius
+	
 	_content: Rectangle{
 		anchors.fill: parent
 		color: mainItem.color
-		radius: AvatarStickerStyle.radius
+		radius: mainItem.radius
 		IncallAvatar {
 			id: avatar
 			anchors.centerIn: parent
diff --git a/linphone-app/ui/modules/Linphone/Sticker/CameraSticker.qml b/linphone-app/ui/modules/Linphone/Sticker/CameraSticker.qml
index 8a5417a9c..b121532c2 100644
--- a/linphone-app/ui/modules/Linphone/Sticker/CameraSticker.qml
+++ b/linphone-app/ui/modules/Linphone/Sticker/CameraSticker.qml
@@ -40,6 +40,10 @@ DecorationSticker{
 	_isPreview: isPreview
 	_showCloseButton: showCloseButton
 	_showActiveSpeakerOverlay: showActiveSpeakerOverlay
+	
+	clip:false
+	radius: CameraStickerStyle.radius
+	
 	_content: Rectangle{
 		anchors.fill: parent
 		color: mainItem.color
@@ -49,7 +53,7 @@ DecorationSticker{
 			id: showArea
 			
 			anchors.fill: parent
-			radius: CameraStickerStyle.radius
+			radius: mainItem.radius
 			visible: false
 			color: 'red'
 		}
diff --git a/linphone-app/ui/modules/Linphone/Sticker/DecorationSticker.qml b/linphone-app/ui/modules/Linphone/Sticker/DecorationSticker.qml
index 1fe369736..80dd24b19 100644
--- a/linphone-app/ui/modules/Linphone/Sticker/DecorationSticker.qml
+++ b/linphone-app/ui/modules/Linphone/Sticker/DecorationSticker.qml
@@ -29,6 +29,8 @@ Item{
 	property bool _customButtonToggled: false
 	property alias _customButtonColorSet : customButton.colorSet
 	
+	property int radius
+	
 	signal closeRequested()
 	signal backgroundClicked()
 	signal customButtonClicked()
@@ -43,7 +45,7 @@ Item{
         glowRadius: 4
         spread: 0.9
         color: DecorationStickerStyle.border.color
-        cornerRadius: (content.radius? content.radius : 0) + glowRadius
+        cornerRadius: (mainItem.radius? mainItem.radius : 0) + glowRadius
         visible: mainItem._showActiveSpeakerOverlay && mainItem._currentDevice && mainItem._currentDevice.isSpeaking
     }
     Item{
diff --git a/linphone-app/ui/modules/Linphone/Sticker/Sticker.qml b/linphone-app/ui/modules/Linphone/Sticker/Sticker.qml
index 9c5e55067..0497ff694 100644
--- a/linphone-app/ui/modules/Linphone/Sticker/Sticker.qml
+++ b/linphone-app/ui/modules/Linphone/Sticker/Sticker.qml
@@ -43,6 +43,8 @@ Flipable{
 	signal videoDefinitionChanged()
 	signal customButtonClicked()
 	
+	clip:false
+	
 	transform: Rotation {
 						id: rotation
 						origin.x: mainItem.width/2
diff --git a/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml b/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
index e360a174f..2236802b5 100644
--- a/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
+++ b/linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
@@ -91,10 +91,11 @@ Item {
 		delegate:Item{
 				height: miniViews.cellHeight
 				width: miniViews.width
-				
+				clip:false
 				Sticker{
 					id: miniView
 					anchors.fill: parent
+					anchors.margins: 3
 					
 					cameraEnabled: index >=0 && mainItem.cameraEnabled
 					currentDevice: modelData
diff --git a/linphone-app/ui/views/App/Main/Conferences.qml b/linphone-app/ui/views/App/Main/Conferences.qml
index 0da8a5b80..43828f597 100644
--- a/linphone-app/ui/views/App/Main/Conferences.qml
+++ b/linphone-app/ui/views/App/Main/Conferences.qml
@@ -16,6 +16,7 @@ Item{
 		id: mainItem
 		property int filterType: -1
 		spacing: 0
+		onFilterTypeChanged: Qt.callLater( conferenceList.positionViewAtEnd)
 		Component.onCompleted: filterType = ConferenceInfoProxyModel.Scheduled
 		anchors.fill: parent
 		// ---------------------------------------------------------------------------
@@ -84,6 +85,7 @@ Item{
 			color: ConferencesStyle.backgroundColor
 			
 			ScrollableListView {
+				id: conferenceList
 				anchors.fill: parent
 				spacing: 10
 				
diff --git a/linphone-sdk b/linphone-sdk
index 64ee6969e..70e789626 160000
--- a/linphone-sdk
+++ b/linphone-sdk
@@ -1 +1 @@
-Subproject commit 64ee6969e500d23f5843a6b2a5fd0918707f88f1
+Subproject commit 70e7896263d7b91e33c03f81c04ad68f07333c84