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

Remove active seaker overlay for activeSeaking mode.

Browse source 
Fix conference entry on main page after an update.
Fix missing id in qml.
This commit is contained in:
Julien Wadel 2022-06-01 15:51:28 +02:00
parent aa543d66bd
commit f3034e897c
6 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
linphone-app/ui/modules/Common/Form/ComboBox.qml
View file

@ -54,6 +54,7 @@ Controls.ComboBox {
width: comboBox.selectionWidth
clip: true
RowLayout {
id: contentLayout
anchors {
fill: parent
leftMargin: comboBox.haveMargin ? ComboBoxStyle.contentItem.leftMargin : 0

3
linphone-app/ui/modules/Linphone/Camera/CameraView.qml
View file

@ -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

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

@ -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,

1
linphone-app/ui/views/App/Calls/VideoConferenceActiveSpeaker.qml
View file

@ -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{

2
linphone-app/ui/views/App/Main/MainWindow.js
View file

@ -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()
}
}

2
linphone-app/ui/views/App/Main/MainWindow.qml
View file

@ -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