mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 03:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix #LINQT-1799 default avatar

Browse source
This commit is contained in:
Gaelle Braud 2025-09-03 14:45:43 +02:00
parent 1f529f333e
commit 12e1e51c0c
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/view/Control/Popup/Notification/NotificationReceivedMessage.qml
View file

@ -17,7 +17,7 @@ Notification {
property var chat: notificationData ? notificationData.chat : null 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 chatRoomName: notificationData?.chatRoomName ? notificationData.chatRoomName : ""
property string remoteAddress: notificationData?.remoteAddress ? notificationData.remoteAddress : "" property string remoteAddress: notificationData?.remoteAddress ? notificationData.remoteAddress : ""
property string chatRoomAddress: notificationData?.chatRoomAddress ? notificationData.chatRoomAddress : "" property string chatRoomAddress: notificationData?.chatRoomAddress ? notificationData.chatRoomAddress : ""
@ -98,7 +98,7 @@ Notification {
// Layout.alignment: Qt.AlignHCenter // Layout.alignment: Qt.AlignHCenter
property var contactObj: UtilsCpp.findFriendByAddress(mainItem.remoteAddress) property var contactObj: UtilsCpp.findFriendByAddress(mainItem.remoteAddress)
contact: contactObj?.value || null contact: contactObj?.value || null
displayNameVal: contact ? "" : mainItem.avatarUri displayNameVal: mainItem.avatarUri
} }
ColumnLayout { ColumnLayout {
spacing: 0 spacing: 0

2
Linphone/view/Page/Form/Chat/SelectedChatView.qml
View file

@ -93,7 +93,7 @@ FocusScope {
Avatar { Avatar {
property var contactObj: mainItem.chat ? UtilsCpp.findFriendByAddress(mainItem.chat?.core.peerAddress) : null property var contactObj: mainItem.chat ? UtilsCpp.findFriendByAddress(mainItem.chat?.core.peerAddress) : null
contact: contactObj?.value || null contact: contactObj?.value || null
displayNameVal: contact ? "" : mainItem.chat?.core.avatarUri displayNameVal: mainItem.chat?.core.avatarUri
secured: mainItem.chat && mainItem.chat.core.isSecured secured: mainItem.chat && mainItem.chat.core.isSecured
Layout.preferredWidth: Math.round(45 * DefaultStyle.dp) Layout.preferredWidth: Math.round(45 * DefaultStyle.dp)
Layout.preferredHeight: Math.round(45 * DefaultStyle.dp) Layout.preferredHeight: Math.round(45 * DefaultStyle.dp)

2
Linphone/view/Page/Layout/Chat/ConversationInfos.qml
View file

@ -24,7 +24,7 @@ ColumnLayout {
Avatar { Avatar {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
contact: contactObj?.value || null contact: contactObj?.value || null
displayNameVal: contact ? "" : mainItem.chatCore.avatarUri displayNameVal: mainItem.chatCore.avatarUri
secured: mainItem.chatGui && mainItem.chatGui.core.isSecured secured: mainItem.chatGui && mainItem.chatGui.core.isSecured
Layout.preferredWidth: Math.round(100 * DefaultStyle.dp) Layout.preferredWidth: Math.round(100 * DefaultStyle.dp)
Layout.preferredHeight: Math.round(100 * DefaultStyle.dp) Layout.preferredHeight: Math.round(100 * DefaultStyle.dp)

2
Linphone/view/Page/Layout/Chat/GroupChatInfoParticipants.qml
View file

@ -71,7 +71,7 @@ ColumnLayout {
property var contact: contactObj?.value || null property var contact: contactObj?.value || null
Avatar { Avatar {
contact: contactObj?.value || null contact: contactObj?.value || null
displayNameVal: contact ? "" : participantCore.displayName displayNameVal: participantCore.displayName
Layout.preferredWidth: Math.round(45 * DefaultStyle.dp) Layout.preferredWidth: Math.round(45 * DefaultStyle.dp)
Layout.preferredHeight: Math.round(45 * DefaultStyle.dp) Layout.preferredHeight: Math.round(45 * DefaultStyle.dp)
} }