d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-25 20:48:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1002 from maltee1/fix_send_with_input_method

Browse source 
properly commit preedit text
This commit is contained in:
DeepBlueV7.X 2022-03-20 04:27:23 +01:00 committed by GitHub
commit 3f134019f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/MessageInput.qml
View file

@ -446,10 +446,10 @@ Rectangle {
width: 22 width: 22
height: 22 height: 22
image: ":/icons/icons/ui/send.svg" image: ":/icons/icons/ui/send.svg"
Layout.rightMargin: 8
ToolTip.visible: hovered ToolTip.visible: hovered
ToolTip.text: qsTr("Send") ToolTip.text: qsTr("Send")
onClicked: { onClicked: {
messageInput.append(messageInput.preeditText)
room.input.send(); room.input.send();
} }
} }

3
src/timeline/InputBar.cpp
View file

@ -9,6 +9,7 @@
#include <QDropEvent> #include <QDropEvent>
#include <QFileDialog> #include <QFileDialog>
#include <QGuiApplication> #include <QGuiApplication>
#include <QInputMethod>
#include <QMimeData> #include <QMimeData>
#include <QMimeDatabase> #include <QMimeDatabase>
#include <QStandardPaths> #include <QStandardPaths>
@ -234,6 +235,8 @@ InputBar::nextText()
void void
InputBar::send() InputBar::send()
{ {
QInputMethod *im = QGuiApplication::inputMethod();
im->commit();
if (text().trimmed().isEmpty()) if (text().trimmed().isEmpty())
return; return;