Fix display names differences with avatar.
This commit is contained in:
parent
30b8134016
commit
b3a3158c95
3 changed files with 5 additions and 3 deletions
|
|
@ -98,7 +98,7 @@ ColumnLayout {
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
text: mainItem.contactName
|
text: detailAvatar.displayNameVal
|
||||||
maximumLineCount: 1
|
maximumLineCount: 1
|
||||||
font {
|
font {
|
||||||
pixelSize: 14 * DefaultStyle.dp
|
pixelSize: 14 * DefaultStyle.dp
|
||||||
|
|
|
||||||
|
|
@ -315,7 +315,9 @@ AbstractMainPage {
|
||||||
id: historyAvatar
|
id: historyAvatar
|
||||||
property var contactObj: UtilsCpp.findFriendByAddress(modelData.core.remoteAddress)
|
property var contactObj: UtilsCpp.findFriendByAddress(modelData.core.remoteAddress)
|
||||||
contact: contactObj?.value || null
|
contact: contactObj?.value || null
|
||||||
_address: modelData.core.remoteAddress
|
_address: modelData.core.conferenceInfo
|
||||||
|
? modelData.core.conferenceInfo.core.subject
|
||||||
|
: modelData.core.remoteAddress
|
||||||
width: 45 * DefaultStyle.dp
|
width: 45 * DefaultStyle.dp
|
||||||
height: 45 * DefaultStyle.dp
|
height: 45 * DefaultStyle.dp
|
||||||
isConference: modelData.core.isConference
|
isConference: modelData.core.isConference
|
||||||
|
|
|
||||||
|
|
@ -239,7 +239,7 @@ AbstractWindow {
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
clip: true
|
clip: true
|
||||||
function open() {
|
function open() {
|
||||||
if (mainItem.isConference) return
|
if (mainWindow.isConference) return
|
||||||
y = headerItem.height/2
|
y = headerItem.height/2
|
||||||
autoCloseZrtpToast.restart()
|
autoCloseZrtpToast.restart()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue