data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes :

Browse source 
Hybrid mode conference video #LINQT-1869

fix switch size

hide some chat header buttons if in call

fix call notification display name #LINQT-2075
This commit is contained in:
Gaelle Braud 2025-10-17 18:45:44 +02:00
parent 4e81981c07
commit 453d16250a
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Linphone/core/notifier/Notifier.cpp
View file

@ -300,9 +300,10 @@ void Notifier::notifyReceivedCall(const shared_ptr<linphone::Call> &call) {
auto model = CallCore::create(call); auto model = CallCore::create(call);
auto gui = new CallGui(model); auto gui = new CallGui(model);
gui->moveToThread(App::getInstance()->thread()); gui->moveToThread(App::getInstance()->thread());
QString displayName = call->getCallLog() && call->getCallLog()->getConferenceInfo() auto callLog = call->getCallLog();
? Utils::coreStringToAppString(call->getCallLog()->getConferenceInfo()->getSubject()) auto displayName = callLog && callLog->getConferenceInfo()
: Utils::coreStringToAppString(call->getRemoteAddress()->getDisplayName()); ? Utils::coreStringToAppString(callLog->getConferenceInfo()->getSubject())
: ToolModel::getDisplayName(call->getRemoteAddress());
// Accessibility alert // Accessibility alert
//: New call from %1 //: New call from %1

1
Linphone/data/config/linphonerc-factory
View file

@ -60,3 +60,4 @@ use_qrcode=0
[video] [video]
auto_resize_preview_to_keep_ratio=1 auto_resize_preview_to_keep_ratio=1
max_conference_size=vga max_conference_size=vga
other_display_mode=Hybrid

8
Linphone/view/Control/Button/Switch.qml
View file

@ -15,9 +15,6 @@ Control.Switch {
pixelSize: Typography.p1.pixelSize pixelSize: Typography.p1.pixelSize
weight: Typography.p1.weight weight: Typography.p1.weight
} }
// Size properties
implicitHeight: Utils.getSizeWithScreenRatio(20)
implicitWidth: Math.round(implicitHeight * 1.6)
// Border properties // Border properties
property color borderColor: "transparent" property color borderColor: "transparent"
property color keyboardFocusedBorderColor: DefaultStyle.main2_900 property color keyboardFocusedBorderColor: DefaultStyle.main2_900
@ -28,8 +25,9 @@ Control.Switch {
id: indicatorItem id: indicatorItem
x: mainItem.leftPadding x: mainItem.leftPadding
y: parent.height / 2 - height / 2 y: parent.height / 2 - height / 2
height: mainItem.height // Size properties
width: mainItem.width implicitHeight: Utils.getSizeWithScreenRatio(20)
implicitWidth: Math.round(implicitHeight * 1.6)
Rectangle { Rectangle {
id: indicatorBackground id: indicatorBackground
anchors.fill: parent anchors.fill: parent

7
Linphone/view/Page/Form/Chat/SelectedChatView.qml
View file

@ -112,6 +112,9 @@ FocusScope {
imageSource: AppIcons.lockSimpleOpen imageSource: AppIcons.lockSimpleOpen
} }
Text { Text {
// hiding text if in call cause te view
// has smaller width
visible: !mainItem.call
Layout.fillWidth: true Layout.fillWidth: true
color: DefaultStyle.warning_700 color: DefaultStyle.warning_700
//: This conversation is not encrypted ! //: This conversation is not encrypted !
@ -132,6 +135,7 @@ FocusScope {
RowLayout { RowLayout {
spacing: Math.round(16 * DefaultStyle.dp) spacing: Math.round(16 * DefaultStyle.dp)
RoundButton { RoundButton {
visible: !mainItem.call
style: ButtonStyle.noBackground style: ButtonStyle.noBackground
icon.source: AppIcons.phone icon.source: AppIcons.phone
onPressed: { onPressed: {
@ -157,11 +161,12 @@ FocusScope {
RoundButton { RoundButton {
style: ButtonStyle.noBackground style: ButtonStyle.noBackground
icon.source: AppIcons.videoCamera icon.source: AppIcons.videoCamera
visible: !mainItem.chat?.core.isGroupChat || false visible: !mainItem.chat?.core.isGroupChat && !mainItem.call
onPressed: mainItem.oneOneCall(true) onPressed: mainItem.oneOneCall(true)
} }
RoundButton { RoundButton {
id: detailsPanelButton id: detailsPanelButton
visible: !mainItem.call
style: ButtonStyle.noBackground style: ButtonStyle.noBackground
checkable: true checkable: true
checkedImageColor: DefaultStyle.main1_500_main checkedImageColor: DefaultStyle.main1_500_main