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

Fix some qml errors on contacts and chats

Browse source
This commit is contained in:
Julien Wadel 2022-01-21 17:33:42 +01:00
parent 5c082db9e4
commit 3be835d378
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
linphone-app/ui/modules/Linphone/Chat/Chat.qml
View file

@ -300,16 +300,16 @@ Rectangle {
width: parent.width
Text {
id: composersItem
property var composers : container.proxyModel.chatRoomModel.composers
property var composers : container.proxyModel.chatRoomModel && container.proxyModel.chatRoomModel.composers
color: ChatStyle.composingText.color
font.pointSize: ChatStyle.composingText.pointSize
height: visible ? undefined : 0
leftPadding: ChatStyle.composingText.leftPadding
visible: composers.length > 0 && ( (!proxyModel.chatRoomModel.haveEncryption && SettingsModel.standardChatEnabled)
visible: composers && composers.length > 0 && ( (!proxyModel.chatRoomModel.haveEncryption && SettingsModel.standardChatEnabled)
|| (proxyModel.chatRoomModel.haveEncryption && SettingsModel.secureChatEnabled) )
wrapMode: Text.Wrap
//: '%1 is typing...' indicate that someone is composing in chat
text:(composers.length==0?'': qsTr('chatTyping','',composers.length).arg(container.proxyModel.getDisplayNameComposers()))
text:(!composers || composers.length==0?'': qsTr('chatTyping','',composers.length).arg(container.proxyModel.getDisplayNameComposers()))
}
}
@ -344,7 +344,7 @@ Rectangle {
anchors.bottom: parent.top
anchors.bottomMargin: -5
anchors.leftMargin: -5
count: container.proxyModel.chatRoomModel.unreadMessagesCount
count: container.proxyModel.chatRoomModel ? container.proxyModel.chatRoomModel.unreadMessagesCount : 0
}
}

2
linphone-app/ui/modules/Linphone/Contact/Contact.qml
View file

@ -134,7 +134,7 @@ Rectangle {
Layout.alignment: Qt.AlignTop
count: entry?Number(entry.unreadMessagesCount) + Number(entry.missedCallsCount):0
isComposing: Boolean(entry && entry.isComposing)
isComposing: Boolean(entry && entry.composers && entry.composers.length > 0)
visible: entry?(entry.unreadMessagesCount !== null || entry.missedCallsCount !== null) && item.displayUnreadMessageCount:false
}

2
linphone-sdk

@ -1 +1 @@
Subproject commit 21c354aaf1c6e39797840bc79a1f60aa70dd6a49
Subproject commit 938bcf6d288eba2ff430165fe3da22f8cde9d42e