mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 03:18:07 +00:00
fix #LINQT-1799 default avatar
This commit is contained in:
parent
1f529f333e
commit
12e1e51c0c
4 changed files with 5 additions and 5 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue