From 12e1e51c0cc05c519ae26ebba01f5db6e95efaa9 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Wed, 3 Sep 2025 14:45:43 +0200 Subject: [PATCH] fix #LINQT-1799 default avatar --- .../Popup/Notification/NotificationReceivedMessage.qml | 4 ++-- Linphone/view/Page/Form/Chat/SelectedChatView.qml | 2 +- Linphone/view/Page/Layout/Chat/ConversationInfos.qml | 2 +- Linphone/view/Page/Layout/Chat/GroupChatInfoParticipants.qml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Linphone/view/Control/Popup/Notification/NotificationReceivedMessage.qml b/Linphone/view/Control/Popup/Notification/NotificationReceivedMessage.qml index d1d3ed8f0..9b248b3e5 100644 --- a/Linphone/view/Control/Popup/Notification/NotificationReceivedMessage.qml +++ b/Linphone/view/Control/Popup/Notification/NotificationReceivedMessage.qml @@ -17,7 +17,7 @@ Notification { property var chat: notificationData ? notificationData.chat : null - property string avatarUri: notificationData?.avatarUri? notificationData.avatarUri : "" + property string avatarUri: notificationData?.avatarUri property string chatRoomName: notificationData?.chatRoomName ? notificationData.chatRoomName : "" property string remoteAddress: notificationData?.remoteAddress ? notificationData.remoteAddress : "" property string chatRoomAddress: notificationData?.chatRoomAddress ? notificationData.chatRoomAddress : "" @@ -98,7 +98,7 @@ Notification { // Layout.alignment: Qt.AlignHCenter property var contactObj: UtilsCpp.findFriendByAddress(mainItem.remoteAddress) contact: contactObj?.value || null - displayNameVal: contact ? "" : mainItem.avatarUri + displayNameVal: mainItem.avatarUri } ColumnLayout { spacing: 0 diff --git a/Linphone/view/Page/Form/Chat/SelectedChatView.qml b/Linphone/view/Page/Form/Chat/SelectedChatView.qml index 2e945754f..41ea7d146 100644 --- a/Linphone/view/Page/Form/Chat/SelectedChatView.qml +++ b/Linphone/view/Page/Form/Chat/SelectedChatView.qml @@ -93,7 +93,7 @@ FocusScope { Avatar { property var contactObj: mainItem.chat ? UtilsCpp.findFriendByAddress(mainItem.chat?.core.peerAddress) : null contact: contactObj?.value || null - displayNameVal: contact ? "" : mainItem.chat?.core.avatarUri + displayNameVal: mainItem.chat?.core.avatarUri secured: mainItem.chat && mainItem.chat.core.isSecured Layout.preferredWidth: Math.round(45 * DefaultStyle.dp) Layout.preferredHeight: Math.round(45 * DefaultStyle.dp) diff --git a/Linphone/view/Page/Layout/Chat/ConversationInfos.qml b/Linphone/view/Page/Layout/Chat/ConversationInfos.qml index 1df08a46b..c1ef60ad1 100644 --- a/Linphone/view/Page/Layout/Chat/ConversationInfos.qml +++ b/Linphone/view/Page/Layout/Chat/ConversationInfos.qml @@ -24,7 +24,7 @@ ColumnLayout { Avatar { Layout.alignment: Qt.AlignHCenter contact: contactObj?.value || null - displayNameVal: contact ? "" : mainItem.chatCore.avatarUri + displayNameVal: mainItem.chatCore.avatarUri secured: mainItem.chatGui && mainItem.chatGui.core.isSecured Layout.preferredWidth: Math.round(100 * DefaultStyle.dp) Layout.preferredHeight: Math.round(100 * DefaultStyle.dp) diff --git a/Linphone/view/Page/Layout/Chat/GroupChatInfoParticipants.qml b/Linphone/view/Page/Layout/Chat/GroupChatInfoParticipants.qml index d2e307e79..53d683e5b 100644 --- a/Linphone/view/Page/Layout/Chat/GroupChatInfoParticipants.qml +++ b/Linphone/view/Page/Layout/Chat/GroupChatInfoParticipants.qml @@ -71,7 +71,7 @@ ColumnLayout { property var contact: contactObj?.value || null Avatar { contact: contactObj?.value || null - displayNameVal: contact ? "" : participantCore.displayName + displayNameVal: participantCore.displayName Layout.preferredWidth: Math.round(45 * DefaultStyle.dp) Layout.preferredHeight: Math.round(45 * DefaultStyle.dp) }