Commit f3034e89 authored by Julien Wadel's avatar Julien Wadel
Browse files

Remove active seaker overlay for activeSeaking mode.

Fix conference entry on main page after an update.
Fix missing id in qml.
parent aa543d66
Pipeline #47695 failed with stage
in 11 minutes and 36 seconds
......@@ -54,6 +54,7 @@ Controls.ComboBox {
width: comboBox.selectionWidth
clip: true
RowLayout {
id: contentLayout
anchors {
fill: parent
leftMargin: comboBox.haveMargin ? ComboBoxStyle.contentItem.leftMargin : 0
......
......@@ -21,6 +21,7 @@ Item{
property alias isFullscreen: camera.isFullscreen
property alias isCameraFromDevice: camera.isCameraFromDevice
property bool showCloseButton: true
property bool showActiveSpeaker: true
property color color : CameraViewStyle.outBackgroundColor
signal closeRequested()
......@@ -35,7 +36,7 @@ Item{
spread: 0.9
color: CameraViewStyle.border.color
cornerRadius: backgroundArea.radius + glowRadius
visible: mainItem.currentDevice && mainItem.currentDevice.isSpeaking
visible: mainItem.showActiveSpeaker && mainItem.currentDevice && mainItem.currentDevice.isSpeaking
}
Rectangle {
id: backgroundArea
......
......@@ -42,7 +42,7 @@ Notification {
property var sipObserver: SipAddressesModel.getSipAddressObserver(notification.fullPeerAddress, notification.fullLocalAddress)
showAuxData: !chatRoomModel.isOneToOne
entry: ({
sipAddress: sipObserver.peerAddress,
sipAddress: sipObserver ? sipObserver.peerAddress : '',
contactModel: sipObserver.contact,
isOneToOne: chatRoomModel.isOneToOne,
haveEncryption: chatRoomModel.haveEncryption,
......
......@@ -46,6 +46,7 @@ Item {
anchors.rightMargin: isRightReducedLayout ? 10 : 140
isPaused: (callModel && callModel.pausedByUser) || (currentDevice && currentDevice.isPaused) //callModel.pausedByUser
showCloseButton: false
showActiveSpeaker: false // This is an active speaker. We don't need to show the indicator.
color: 'black'
}
ScrollableListView{
......
......@@ -116,7 +116,7 @@ function updateSelectedEntry (view, props) {
} else if (view === 'Contacts') {
item.contactsEntry.select()
} else if (view === 'Conferences') {
item.contactsEntry.select()
item.conferencesEntry.select()
}
}
......
......@@ -72,6 +72,8 @@ ApplicationWindow {
sourceComponent: ColumnLayout {
// Workaround to get these properties in `MainWindow.js`.
readonly property alias contactsEntry: contactsEntry
readonly property alias conferencesEntry: conferencesEntry
readonly property alias contentLoader: contentLoader
//readonly property alias conferencesEntry: conferencesEntry
readonly property alias menu: menu
......
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