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

Close camera before calling from Waiting room.

Browse source 
Synchronize video layout to current call in menu.
This commit is contained in:
Julien Wadel 2022-09-29 14:01:53 +02:00
parent 9524833e95
commit bd5508695b
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
linphone-app/ui/modules/Linphone/Menus/IncallMenu.qml
View file

@ -235,10 +235,12 @@ Rectangle{
ButtonGroup.group: modeGroup
text: modelData.text
// break bind. Radiobutton checked itself without taking care of custom binding. This workaound works as long as we don't really need the binding.
Component.onCompleted: checked = mainItem.callModel ? (mainItem.callModel.localVideoEnabled && modelData.value == mainItem.callModel.conferenceVideoLayout)
property bool isInternallyChecked: mainItem.callModel ? (mainItem.callModel.localVideoEnabled && modelData.value == mainItem.callModel.conferenceVideoLayout)
|| (!mainItem.callModel.localVideoEnabled && modelData.value == 2)
: false
// break bind. Radiobutton checked itself without taking care of custom binding. This workaound works as long as we don't really need the binding.
onIsInternallyCheckedChanged: checked = isInternallyChecked
Component.onCompleted: checked = isInternallyChecked
Timer{
id: changingLayoutDelay
interval: 100

3
linphone-app/ui/views/App/Calls/WaitingRoom.qml
View file

@ -315,7 +315,8 @@ Rectangle {
backgroundRadius: width/2
colorSet: WaitingRoomStyle.buttons.call
visible: false && !callModel && conferenceInfoModel
onClicked: {CallsListModel.launchVideoCall(conferenceInfoModel.uri, '', 0,
onClicked: {mainItem.close()
CallsListModel.launchVideoCall(conferenceInfoModel.uri, '', 0,
{ video: modeChoice.selectedMode != 2
, camera: camera.cameraEnabled
, micro: !micro.microMuted