fix
This commit is contained in:
parent
f1fb447fa3
commit
eb8c95f192
6 changed files with 8 additions and 8 deletions
|
|
@ -73,7 +73,7 @@ ColumnLayout {
|
|||
width: 100 * DefaultStyle.dp
|
||||
height: 100 * DefaultStyle.dp
|
||||
contact: mainItem.contact || null
|
||||
isConferenceInfo: mainItem.conferenceInfo
|
||||
isConference: !!mainItem.conferenceInfo
|
||||
_address: mainItem.conferenceInfo
|
||||
? mainItem.conferenceInfo.core.subject
|
||||
: mainItem.contactAddress || mainItem.contactName
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ Item {
|
|||
property bool callTerminatedByUser: false
|
||||
property bool callStarted: call?.core.isStarted
|
||||
readonly property var callState: call? call.core.state : undefined
|
||||
property int conferenceLayout: call && call.core.conferenceVideoLayout || LinphoneEnums.ConferenceLayout.ActiveSpeaker
|
||||
property int conferenceLayout: call ? call.core.conferenceVideoLayout : LinphoneEnums.ConferenceLayout.ActiveSpeaker
|
||||
// property int participantDeviceCount: conference ? conference.core.participantDeviceCount : -1
|
||||
// onParticipantDeviceCountChanged: {
|
||||
// setConferenceLayout()
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ ListView {
|
|||
Layout.preferredWidth: 45 * DefaultStyle.dp
|
||||
Layout.preferredHeight: 45 * DefaultStyle.dp
|
||||
_address: modelData.core.remoteAddress
|
||||
isConferenceInfo: modelData.core.isConference
|
||||
isConference: modelData.core.isConference
|
||||
}
|
||||
ColumnLayout {
|
||||
spacing: 0
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ Loader{
|
|||
property AccountGui account: null
|
||||
property FriendGui contact: null
|
||||
property CallGui call: null
|
||||
property bool isConferenceInfo: false
|
||||
property bool isConference: false
|
||||
property string _address: account
|
||||
? account.core?.identityAddress || ""
|
||||
: call
|
||||
|
|
@ -144,7 +144,7 @@ Loader{
|
|||
width: height
|
||||
Rectangle {
|
||||
id: initialItem
|
||||
property string initials: mainItem.isConferenceInfo ? "" : UtilsCpp.getInitials(mainItem.displayNameVal)
|
||||
property string initials: mainItem.isConference ? "" : UtilsCpp.getInitials(mainItem.displayNameVal)
|
||||
radius: width / 2
|
||||
color: DefaultStyle.main2_200
|
||||
height: stackView.height
|
||||
|
|
@ -166,7 +166,7 @@ Loader{
|
|||
visible: initialItem.initials == ''
|
||||
width: stackView.width/2
|
||||
height: width
|
||||
source: mainItem.isConferenceInfo ? AppIcons.usersThree : AppIcons.profile
|
||||
source: mainItem.isConference ? AppIcons.usersThree : AppIcons.profile
|
||||
sourceSize.width: width
|
||||
sourceSize.height: height
|
||||
anchors.centerIn: parent
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ Notification {
|
|||
Layout.preferredHeight: 60 * DefaultStyle.dp
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
call: mainItem.call
|
||||
isConferenceInfo: mainItem.call && mainItem.call.core.isConference
|
||||
isConference: mainItem.call && mainItem.call.core.isConference
|
||||
}
|
||||
ColumnLayout {
|
||||
spacing: 0
|
||||
|
|
|
|||
|
|
@ -305,7 +305,7 @@ AbstractMainPage {
|
|||
_address: modelData.core.remoteAddress
|
||||
width: 45 * DefaultStyle.dp
|
||||
height: 45 * DefaultStyle.dp
|
||||
isConferenceInfo: modelData.core.isConference
|
||||
isConference: modelData.core.isConference
|
||||
}
|
||||
ColumnLayout {
|
||||
Layout.fillHeight: true
|
||||
|
|
|
|||
Loading…
Reference in a new issue