From fbbcbe20124339880f3044c83f80fc85147f6114 Mon Sep 17 00:00:00 2001
From: Gaelle Braud <gaelle.braud@belledonne-communications.com>
Date: Tue, 19 Nov 2024 14:24:40 +0100
Subject: [PATCH] fix #LINQT-1425 timer close calls win

fix #LINQT-1426 end message call

fix full name

fix notif alignment
---
 Linphone/core/friend/FriendCore.cpp              |  2 +-
 .../Notification/NotificationReceivedCall.qml    | 16 +++++++---------
 Linphone/view/Page/Window/Call/CallsWindow.qml   |  7 +++++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Linphone/core/friend/FriendCore.cpp b/Linphone/core/friend/FriendCore.cpp
index e4db121a5..03261dc0d 100644
--- a/Linphone/core/friend/FriendCore.cpp
+++ b/Linphone/core/friend/FriendCore.cpp
@@ -109,7 +109,7 @@ FriendCore::FriendCore(const std::shared_ptr<linphone::Friend> &contact, bool is
 	connect(this, &FriendCore::addressChanged, &FriendCore::allAddressesChanged);
 	connect(this, &FriendCore::phoneNumberChanged, &FriendCore::allAddressesChanged);
 	auto updateFullName = [this] {
-		auto name = (mGivenName.isEmpty() ? "" : mGivenName) + (mFamilyName.isEmpty() ? "" : mFamilyName);
+		auto name = mGivenName + (!mGivenName.isEmpty() && !mFamilyName.isEmpty() ? " " : "") + mFamilyName;
 		if (!name.isEmpty()) setFullName(name);
 	};
 	connect(this, &FriendCore::givenNameChanged, updateFullName);
diff --git a/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml b/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
index bf01a20fd..094a50e7a 100644
--- a/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
+++ b/Linphone/view/Control/Popup/Notification/NotificationReceivedCall.qml
@@ -7,8 +7,8 @@ import UtilsCpp
 Notification {
 	id: mainItem
 	radius: 20 * DefaultStyle.dp
-    overriddenWidth: 450 * DefaultStyle.dp//content.width//101 * DefaultStyle.dp
-    overriddenHeight: 101 * DefaultStyle.dp//content.height//
+	overriddenWidth: 450 * DefaultStyle.dp//content.width
+	overriddenHeight: 101 * DefaultStyle.dp//content.height
 	
 	readonly property var call: notificationData && notificationData.call
 	property var state: call.core.state
@@ -25,17 +25,15 @@ Notification {
 	Popup {
 		id: content
 		visible: mainItem.visible
-		leftPadding: 19 * DefaultStyle.dp
-		rightPadding: 19 * DefaultStyle.dp
+		width: parent.width
+		height: parent.height
+		leftPadding: 26 * DefaultStyle.dp
+		rightPadding: 26 * DefaultStyle.dp
 		topPadding: 15 * DefaultStyle.dp
 		bottomPadding: 15 * DefaultStyle.dp
 		background: Item{}
 		contentItem: RowLayout {
-			id: notifContent
-			
 			spacing: 15 * DefaultStyle.dp
-			height: childrenRect.height
-			width: childrenRect.width
 			RowLayout {
 				Layout.fillWidth: true
 				Layout.alignment: Qt.AlignLeft
@@ -80,7 +78,7 @@ Notification {
 					}
 				}
 			}
-		
+			Item{Layout.fillWidth: true}
 			RowLayout {
 				Layout.alignment: Qt.AlignHCenter
 				Layout.fillWidth: true
diff --git a/Linphone/view/Page/Window/Call/CallsWindow.qml b/Linphone/view/Page/Window/Call/CallsWindow.qml
index 314e12a71..d9a6e167a 100644
--- a/Linphone/view/Page/Window/Call/CallsWindow.qml
+++ b/Linphone/view/Page/Window/Call/CallsWindow.qml
@@ -149,7 +149,7 @@ AbstractWindow {
 	
 	Timer {
 		id: autoCloseWindow
-		interval: 3000
+		interval: mainWindow.callTerminatedByUser ? 1000 : 2000
 		onTriggered: {
 			UtilsCpp.closeCallsWindow()
 		} 
@@ -157,7 +157,10 @@ AbstractWindow {
 
 	Dialog {
 		id: terminateAllCallsDialog
-		onAccepted: call.core.lTerminateAllCalls()
+		onAccepted: {
+			mainWindow.callTerminatedByUser = true
+			call.core.lTerminateAllCalls()
+		}
 		width: 278 * DefaultStyle.dp
 		text: qsTr("La fenêtre est sur le point d'être fermée. Cela terminera tous les appels en cours. Souhaitez vous continuer ?")
 	}