From 453d16250ae7ffdaa91a83c06e818da105e6d05d Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Fri, 17 Oct 2025 18:45:44 +0200 Subject: [PATCH] Fixes : Hybrid mode conference video #LINQT-1869 fix switch size hide some chat header buttons if in call fix call notification display name #LINQT-2075 --- Linphone/core/notifier/Notifier.cpp | 7 ++++--- Linphone/data/config/linphonerc-factory | 1 + Linphone/view/Control/Button/Switch.qml | 8 +++----- Linphone/view/Page/Form/Chat/SelectedChatView.qml | 7 ++++++- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Linphone/core/notifier/Notifier.cpp b/Linphone/core/notifier/Notifier.cpp index 8556ebc63..cb732e527 100644 --- a/Linphone/core/notifier/Notifier.cpp +++ b/Linphone/core/notifier/Notifier.cpp @@ -300,9 +300,10 @@ void Notifier::notifyReceivedCall(const shared_ptr &call) { auto model = CallCore::create(call); auto gui = new CallGui(model); gui->moveToThread(App::getInstance()->thread()); - QString displayName = call->getCallLog() && call->getCallLog()->getConferenceInfo() - ? Utils::coreStringToAppString(call->getCallLog()->getConferenceInfo()->getSubject()) - : Utils::coreStringToAppString(call->getRemoteAddress()->getDisplayName()); + auto callLog = call->getCallLog(); + auto displayName = callLog && callLog->getConferenceInfo() + ? Utils::coreStringToAppString(callLog->getConferenceInfo()->getSubject()) + : ToolModel::getDisplayName(call->getRemoteAddress()); // Accessibility alert //: New call from %1 diff --git a/Linphone/data/config/linphonerc-factory b/Linphone/data/config/linphonerc-factory index dd8b6ddec..2f8aec030 100644 --- a/Linphone/data/config/linphonerc-factory +++ b/Linphone/data/config/linphonerc-factory @@ -60,3 +60,4 @@ use_qrcode=0 [video] auto_resize_preview_to_keep_ratio=1 max_conference_size=vga +other_display_mode=Hybrid \ No newline at end of file diff --git a/Linphone/view/Control/Button/Switch.qml b/Linphone/view/Control/Button/Switch.qml index 91ef394c4..45a23011c 100644 --- a/Linphone/view/Control/Button/Switch.qml +++ b/Linphone/view/Control/Button/Switch.qml @@ -15,9 +15,6 @@ Control.Switch { pixelSize: Typography.p1.pixelSize weight: Typography.p1.weight } - // Size properties - implicitHeight: Utils.getSizeWithScreenRatio(20) - implicitWidth: Math.round(implicitHeight * 1.6) // Border properties property color borderColor: "transparent" property color keyboardFocusedBorderColor: DefaultStyle.main2_900 @@ -28,8 +25,9 @@ Control.Switch { id: indicatorItem x: mainItem.leftPadding y: parent.height / 2 - height / 2 - height: mainItem.height - width: mainItem.width + // Size properties + implicitHeight: Utils.getSizeWithScreenRatio(20) + implicitWidth: Math.round(implicitHeight * 1.6) Rectangle { id: indicatorBackground anchors.fill: parent diff --git a/Linphone/view/Page/Form/Chat/SelectedChatView.qml b/Linphone/view/Page/Form/Chat/SelectedChatView.qml index c3b4c00e3..ff8a82803 100644 --- a/Linphone/view/Page/Form/Chat/SelectedChatView.qml +++ b/Linphone/view/Page/Form/Chat/SelectedChatView.qml @@ -112,6 +112,9 @@ FocusScope { imageSource: AppIcons.lockSimpleOpen } Text { + // hiding text if in call cause te view + // has smaller width + visible: !mainItem.call Layout.fillWidth: true color: DefaultStyle.warning_700 //: This conversation is not encrypted ! @@ -132,6 +135,7 @@ FocusScope { RowLayout { spacing: Math.round(16 * DefaultStyle.dp) RoundButton { + visible: !mainItem.call style: ButtonStyle.noBackground icon.source: AppIcons.phone onPressed: { @@ -157,11 +161,12 @@ FocusScope { RoundButton { style: ButtonStyle.noBackground icon.source: AppIcons.videoCamera - visible: !mainItem.chat?.core.isGroupChat || false + visible: !mainItem.chat?.core.isGroupChat && !mainItem.call onPressed: mainItem.oneOneCall(true) } RoundButton { id: detailsPanelButton + visible: !mainItem.call style: ButtonStyle.noBackground checkable: true checkedImageColor: DefaultStyle.main1_500_main