From b3a3158c95c02b52a37fe6335b4264e9ea9a4b9f Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 21 Jan 2025 11:07:06 +0100 Subject: [PATCH] Fix display names differences with avatar. --- Linphone/view/Control/Container/Call/CallHistoryLayout.qml | 2 +- Linphone/view/Page/Main/Call/CallPage.qml | 4 +++- Linphone/view/Page/Window/Call/CallsWindow.qml | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Linphone/view/Control/Container/Call/CallHistoryLayout.qml b/Linphone/view/Control/Container/Call/CallHistoryLayout.qml index b33a91f5c..584ae4776 100644 --- a/Linphone/view/Control/Container/Call/CallHistoryLayout.qml +++ b/Linphone/view/Control/Container/Call/CallHistoryLayout.qml @@ -98,7 +98,7 @@ ColumnLayout { Layout.alignment: Qt.AlignHCenter horizontalAlignment: Text.AlignHCenter elide: Text.ElideRight - text: mainItem.contactName + text: detailAvatar.displayNameVal maximumLineCount: 1 font { pixelSize: 14 * DefaultStyle.dp diff --git a/Linphone/view/Page/Main/Call/CallPage.qml b/Linphone/view/Page/Main/Call/CallPage.qml index 329eb4ade..2af793251 100644 --- a/Linphone/view/Page/Main/Call/CallPage.qml +++ b/Linphone/view/Page/Main/Call/CallPage.qml @@ -315,7 +315,9 @@ AbstractMainPage { id: historyAvatar property var contactObj: UtilsCpp.findFriendByAddress(modelData.core.remoteAddress) contact: contactObj?.value || null - _address: modelData.core.remoteAddress + _address: modelData.core.conferenceInfo + ? modelData.core.conferenceInfo.core.subject + : modelData.core.remoteAddress width: 45 * DefaultStyle.dp height: 45 * DefaultStyle.dp isConference: modelData.core.isConference diff --git a/Linphone/view/Page/Window/Call/CallsWindow.qml b/Linphone/view/Page/Window/Call/CallsWindow.qml index c1bd07733..b87682625 100644 --- a/Linphone/view/Page/Window/Call/CallsWindow.qml +++ b/Linphone/view/Page/Window/Call/CallsWindow.qml @@ -239,7 +239,7 @@ AbstractWindow { anchors.horizontalCenter: parent.horizontalCenter clip: true function open() { - if (mainItem.isConference) return + if (mainWindow.isConference) return y = headerItem.height/2 autoCloseZrtpToast.restart() }