mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hide calls window when going to fullscreen.

Browse source 
Fix black previews on Active Speaker.
This commit is contained in:
Julien Wadel 2022-10-04 11:47:36 +02:00
parent c0621a1bf9
commit 922f64ce94
3 changed files with 41 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linphone-app/ui/views/App/Calls/CallsWindow.qml
View file

@ -257,6 +257,11 @@ Window {
enabled: window.visible
listCallsOpened: window.callsIsOpened
onOpenListCallsRequest: mainPaned.open()
onIsFullScreenChanged: if(isFullScreen){
window.hide()
}else{
window.show()
}
}
}

2
linphone-app/ui/views/App/Calls/Incall.qml
View file

@ -333,7 +333,7 @@ Rectangle {
: activeSpeakerComponent
: activeSpeakerComponent
onSourceComponentChanged: console.log("conferenceLayout: "+mainItem.callModel.conferenceVideoLayout)
active: mainItem.callModel
active: mainItem.callModel && !mainItem.isFullScreen
}
Rectangle{
anchors.fill: parent

62
linphone-app/ui/views/App/Calls/IncallActiveSpeaker.qml
View file

@ -40,11 +40,11 @@ Item {
onConferenceCreated: cameraView.resetCamera()
function updateCurrentDevice(){
var device = getLastActiveSpeaking()
if(device) // Get
cameraView.currentDevice = device
var device = getLastActiveSpeaking()
if(device) // Get
cameraView.currentDevice = device
}
onMeChanged: if( cameraView.isPreview) {
onMeChanged: if(cameraView.isPreview) {
cameraView.currentDevice = me
cameraView.resetCamera()
}
@ -59,17 +59,22 @@ Item {
Sticker{
id: cameraView
callModel: mainItem.callModel
deactivateCamera: (callModel && callModel.pausedByUser) || !mainItem.cameraEnabled || (currentDevice && !currentDevice.videoEnabled)
isPreview: mainItem.showMe && allDevices.count == 0
onIsPreviewChanged: if( isPreview){
currentDevice = allDevices.me
cameraView.resetCamera()
}
isCameraFromDevice: isPreview
anchors.fill: parent
anchors.leftMargin: isRightReducedLayout || isLeftReducedLayout? 30 : 140
anchors.rightMargin: isRightReducedLayout ? 10 : 140
callModel: mainItem.callModel
deactivateCamera: (callModel && callModel.pausedByUser) || !mainItem.cameraEnabled || (currentDevice && !currentDevice.videoEnabled)
isPreview: mainItem.showMe && mainItem.participantCount == 1
onIsPreviewChanged: {
if( isPreview){
currentDevice = allDevices.me
cameraView.resetCamera()
}else
allDevices.updateCurrentDevice()
cameraView.resetCamera()
}
isCameraFromDevice: isPreview
isPaused: (callModel && callModel.pausedByUser) || (currentDevice && currentDevice.isPaused) //callModel.pausedByUser
quickTransition: true
showCloseButton: false
@ -89,23 +94,26 @@ Item {
width: 16 * height / 9
visible: mainItem.showMe && (!callModel.isConference || allDevices.count >= 1)
onVisibleChanged: if(visible) previewSticker.resetCamera()
Sticker{
id: previewSticker
Loader{
anchors.fill: parent
anchors.margins: 3
deactivateCamera: !mainItem.callModel || !mainItem.showMe || !mainItem.callModel.cameraEnabled
//onDeactivateCameraChanged: console.log(deactivateCamera + " = " +mainItem.callModel +" / " +mainItem.showMe +" / " +mainItem.callModel.localVideoEnabled)
currentDevice: allDevices.me
isPreview: true
callModel: mainItem.callModel
isCameraFromDevice: true
showCloseButton: false
showCustomButton: false
showAvatarBorder: true
avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerPreviewBackgroundColor
avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor
sourceComponent:
Sticker{
id: previewSticker
deactivateCamera: !mainItem.callModel || !mainItem.showMe || !mainItem.callModel.cameraEnabled
//onDeactivateCameraChanged: console.log(deactivateCamera + " = " +mainItem.callModel +" / " +mainItem.showMe +" / " +mainItem.callModel.localVideoEnabled)
currentDevice: allDevices.me
isPreview: true
callModel: mainItem.callModel
isCameraFromDevice: true
showCloseButton: false
showCustomButton: false
showAvatarBorder: true
avatarStickerBackgroundColor: IncallStyle.container.avatar.stickerPreviewBackgroundColor
avatarBackgroundColor: IncallStyle.container.avatar.backgroundColor
}
active: parent.visible
}
}
Item{