Commit c821636a authored by Ronan Abhamon's avatar Ronan Abhamon

feat(ui/views/App/Calls/Incall): little fixes

parent ff749bbb
...@@ -38,7 +38,7 @@ Rectangle { ...@@ -38,7 +38,7 @@ Rectangle {
ContactDescription { ContactDescription {
id: contactDescription id: contactDescription
height: CallStyle.header.contactDescriptionHeight height: CallStyle.header.contactDescription.height
horizontalTextAlignment: Text.AlignHCenter horizontalTextAlignment: Text.AlignHCenter
sipAddress: call.sipAddress sipAddress: call.sipAddress
username: LinphoneUtils.getContactUsername(_contactObserver.contact || call.sipAddress) username: LinphoneUtils.getContactUsername(_contactObserver.contact || call.sipAddress)
...@@ -81,7 +81,7 @@ Rectangle { ...@@ -81,7 +81,7 @@ Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
backgroundColor: CallStyle.container.avatar.backgroundColor backgroundColor: CallStyle.container.avatar.backgroundColor
image: _contactObserver.contact && _contactObserver.contact.avatar image: _contactObserver.contact && _contactObserver.contact.vcard.avatar
username: contactDescription.username username: contactDescription.username
height: _computeAvatarSize() height: _computeAvatarSize()
......
...@@ -41,7 +41,7 @@ Rectangle { ...@@ -41,7 +41,7 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: CallStyle.header.leftMargin Layout.leftMargin: CallStyle.header.leftMargin
Layout.rightMargin: CallStyle.header.rightMargin Layout.rightMargin: CallStyle.header.rightMargin
Layout.preferredHeight: CallStyle.header.contactDescriptionHeight Layout.preferredHeight: CallStyle.header.contactDescription.height
Icon { Icon {
id: callQuality id: callQuality
...@@ -49,7 +49,7 @@ Rectangle { ...@@ -49,7 +49,7 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
icon: 'call_quality_0' icon: 'call_quality_0'
iconSize: CallStyle.header.iconSize iconSize: CallStyle.header.iconSize
onIconChanged: console.log(icon)
// See: http://www.linphone.org/docs/liblinphone/group__call__misc.html#ga62c7d3d08531b0cc634b797e273a0a73 // See: http://www.linphone.org/docs/liblinphone/group__call__misc.html#ga62c7d3d08531b0cc634b797e273a0a73
Timer { Timer {
interval: 5000 interval: 5000
...@@ -77,13 +77,16 @@ Rectangle { ...@@ -77,13 +77,16 @@ Rectangle {
username: LinphoneUtils.getContactUsername(_contactObserver.contact || call.sipAddress) username: LinphoneUtils.getContactUsername(_contactObserver.contact || call.sipAddress)
height: parent.height height: parent.height
width: parent.width - cameraActions.width - callQuality.width - 150 width: parent.width - cameraActions.width - callQuality.width - CallStyle.header.contactDescription.width
} }
ActionBar { Loader {
id: cameraActions id: cameraActions
anchors.right: parent.right anchors.right: parent.right
active: call.videoInputEnabled
sourceComponent: ActionBar {
iconSize: CallStyle.header.iconSize iconSize: CallStyle.header.iconSize
ActionButton { ActionButton {
...@@ -99,6 +102,7 @@ Rectangle { ...@@ -99,6 +102,7 @@ Rectangle {
} }
} }
} }
}
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Contact visual. // Contact visual.
...@@ -127,7 +131,7 @@ Rectangle { ...@@ -127,7 +131,7 @@ Rectangle {
} }
backgroundColor: CallStyle.container.avatar.backgroundColor backgroundColor: CallStyle.container.avatar.backgroundColor
image: _contactObserver.contact ? _contactObserver.contact.vcard.avatar : '' image: _contactObserver.contact && _contactObserver.contact.vcard.avatar
username: contactDescription.username username: contactDescription.username
height: _computeAvatarSize() height: _computeAvatarSize()
......
...@@ -31,7 +31,6 @@ QtObject { ...@@ -31,7 +31,6 @@ QtObject {
} }
property QtObject header: QtObject { property QtObject header: QtObject {
property int contactDescriptionHeight: 60
property int iconSize: 40 property int iconSize: 40
property int leftMargin: 20 property int leftMargin: 20
property int rightMargin: 20 property int rightMargin: 20
...@@ -43,5 +42,10 @@ QtObject { ...@@ -43,5 +42,10 @@ QtObject {
property int height: 30 property int height: 30
property int width: 30 property int width: 30
} }
property QtObject contactDescription: QtObject {
property int height: 60
property int width: 150
}
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment