From c66d9cb04f7fab002f99bd049c6fe1025d96d208 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Wed, 11 Dec 2024 13:47:53 +0100 Subject: [PATCH] to test s --- Linphone/view/Control/Form/Settings/ScreencastSettings.qml | 5 +++++ Linphone/view/Page/Window/Call/CallsWindow.qml | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Linphone/view/Control/Form/Settings/ScreencastSettings.qml b/Linphone/view/Control/Form/Settings/ScreencastSettings.qml index 39266f188..505fa31ea 100644 --- a/Linphone/view/Control/Form/Settings/ScreencastSettings.qml +++ b/Linphone/view/Control/Form/Settings/ScreencastSettings.qml @@ -155,11 +155,16 @@ ColumnLayout { } } Button { + Layout.alignment: Qt.AlignHCenter visible: mainItem.screenSharingAvailable enabled: windowsLayout.currentIndex !== -1 || screensLayout.currentIndex !== -1 text: mainItem.conference && mainItem.conference.core.isLocalScreenSharing ? qsTr("Stop") : qsTr("Partager") onClicked: mainItem.conference.core.lToggleScreenSharing() + leftPadding: 20 * DefaultStyle.dp + rightPadding: 20 * DefaultStyle.dp + topPadding: 11 * DefaultStyle.dp + bottomPadding: 11 * DefaultStyle.dp } } diff --git a/Linphone/view/Page/Window/Call/CallsWindow.qml b/Linphone/view/Page/Window/Call/CallsWindow.qml index 78d8fd14f..ffef26722 100644 --- a/Linphone/view/Page/Window/Call/CallsWindow.qml +++ b/Linphone/view/Page/Window/Call/CallsWindow.qml @@ -85,7 +85,11 @@ AbstractWindow { } function endCall(callToFinish) { - if (callToFinish) callToFinish.core.lTerminate() + if (callToFinish) { + if (callToFinish && callToFinish.conference && callToFinish.conference.core.isScreenSharingEnabled) + callToFinish.conference.core.lToggleScreenSharing() + callToFinish.core.lTerminate() + } // var mainWin = UtilsCpp.getMainWindow() // mainWin.goToCallHistory() }