From 87118d2c8823bde53c4ff5c34fb037fdb0990cb4 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Fri, 27 Oct 2023 10:11:01 +0200 Subject: [PATCH] Fix sending composing when opening chat. Update SDK. --- linphone-app/ui/modules/Common/Form/DroppableTextArea.qml | 3 +++ linphone-app/ui/modules/Linphone/Chat/Chat.js | 3 --- linphone-app/ui/modules/Linphone/Chat/Chat.qml | 2 +- linphone-sdk | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml b/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml index 597aaf6e3..22131ab52 100644 --- a/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml +++ b/linphone-app/ui/modules/Common/Form/DroppableTextArea.qml @@ -40,6 +40,7 @@ Item { signal validText (string text) signal audioRecordRequest() signal emojiClicked() + signal composing() // --------------------------------------------------------------------------- @@ -267,6 +268,7 @@ Item { Clipboard.restore() } else isAutoRepeating = false// We are no more repeating. Final decision is done on Releasing + droppableTextArea.composing() } Keys.onPressed: { if(event.isAutoRepeat){ @@ -296,6 +298,7 @@ Item { } } } + droppableTextArea.composing() } } } diff --git a/linphone-app/ui/modules/Linphone/Chat/Chat.js b/linphone-app/ui/modules/Linphone/Chat/Chat.js index 8693b064b..bc4d266fa 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Chat.js +++ b/linphone-app/ui/modules/Linphone/Chat/Chat.js @@ -68,9 +68,6 @@ function handleMovementStarted () { chat.bindToEnd = false } -function handleTextChanged (text) { - container.proxyModel.compose(text) -} function sendMessage (text) { textArea.text = '' diff --git a/linphone-app/ui/modules/Linphone/Chat/Chat.qml b/linphone-app/ui/modules/Linphone/Chat/Chat.qml index e0c28d1c4..575b9b4ea 100644 --- a/linphone-app/ui/modules/Linphone/Chat/Chat.qml +++ b/linphone-app/ui/modules/Linphone/Chat/Chat.qml @@ -469,9 +469,9 @@ Rectangle { onTextChanged: {// This slot can be call before the item has been completed because of Rich text. So the cache must not take it account. if(componentReady) { proxyModel.cachedText=text - Logic.handleTextChanged(textArea.getText()) } } + onComposing: proxyModel.compose(getText()) onValidText: { textArea.text = '' chat.bindToEnd = true diff --git a/linphone-sdk b/linphone-sdk index 8756a37ad..40373878e 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit 8756a37ad10399a0c27d32590a0d1cc87ea97c2e +Subproject commit 40373878e26ab10c31c7237f1a22758aac3939ab