From fd6ca7f2cf65ab367d10282844bb9cf095a28a0c Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Mon, 29 May 2017 14:18:27 +0200 Subject: [PATCH] feat(ui/views/App/Calls/ConferenceManager): in progress --- .../ui/modules/Linphone/Calls/Calls.qml | 19 +++++++++++++++++-- .../ui/views/App/Calls/Conference.qml | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/linphone-desktop/ui/modules/Linphone/Calls/Calls.qml b/linphone-desktop/ui/modules/Linphone/Calls/Calls.qml index fbfaa6082..89309129c 100644 --- a/linphone-desktop/ui/modules/Linphone/Calls/Calls.qml +++ b/linphone-desktop/ui/modules/Linphone/Calls/Calls.qml @@ -73,7 +73,7 @@ ListView { entryWidth: CallsStyle.entry.width Repeater { - model: params.actions + model: params ? params.actions : [] DropDownStaticMenuEntry { entryName: modelData.name @@ -93,10 +93,25 @@ ListView { // --------------------------------------------------------------------------- header: ConferenceControls { + readonly property bool isSelected: calls.currentIndex === -1 && + calls._selectedCall == null && + visible + height: visible ? ConferenceControlsStyle.height : 0 width: parent.width visible: calls.conferenceModel.count > 0 + + color: isSelected + ? CallsStyle.entry.color.selected + : CallsStyle.entry.color.normal + + textColor: isSelected + ? CallsStyle.entry.usernameColor.selected + : CallsStyle.entry.usernameColor.normal + + onClicked: Logic.resetSelectedCall() + onVisibleChanged: !visible && Logic.handleCountChanged(calls.count) } // --------------------------------------------------------------------------- @@ -155,7 +170,7 @@ ListView { SequentialAnimation on color { loops: CallsStyle.entry.endCallAnimation.loops - running: $call.status === CallModel.CallStatusEnded + running: $call && $call.status === CallModel.CallStatusEnded ColorAnimation { duration: CallsStyle.entry.endCallAnimation.duration diff --git a/linphone-desktop/ui/views/App/Calls/Conference.qml b/linphone-desktop/ui/views/App/Calls/Conference.qml index b628c9ee5..2569ac779 100644 --- a/linphone-desktop/ui/views/App/Calls/Conference.qml +++ b/linphone-desktop/ui/views/App/Calls/Conference.qml @@ -144,7 +144,7 @@ Rectangle { width: size backgroundColor: CallStyle.container.avatar.backgroundColor - foregroundColor: $call.status === CallModel.CallStatusPaused + foregroundColor: $call && $call.status === CallModel.CallStatusPaused ? CallStyle.container.pause.color : 'transparent'