summary refs log tree commit diff
path: root/resources/qml
diff options
context:
space:
mode:
authorMalte E <malte.e@mailbox.org>2022-03-20 22:17:25 +0100
committerMalte E <malte.e@mailbox.org>2022-03-20 22:17:25 +0100
commitf563098e9a18d568ba388ce0c755c078d2310399 (patch)
tree8be4789dbf6d3ac9e387f2dfa56801900d9f548d /resources/qml
parentadd preedit text to search (diff)
downloadnheko-f563098e9a18d568ba388ce0c755c078d2310399.tar.xz
Don't send on Enter when inputMethod.visible ( == OSK active assumed)
Diffstat (limited to 'resources/qml')
-rw-r--r--resources/qml/MessageInput.qml6
1 files changed, 4 insertions, 2 deletions
diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml
index d8a271fe..76c498d9 100644
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@@ -224,8 +224,10 @@ Rectangle {
                                 return;
                             }
                         }
-                        room.input.send();
-                        event.accepted = true;
+                        if (!Qt.inputMethod.visible) {
+                            room.input.send();
+                            event.accepted = true;
+                        }
                     } else if (event.key == Qt.Key_Tab && (event.modifiers == Qt.NoModifier || event.modifiers == Qt.ShiftModifier)) {
                         event.accepted = true;
                         if (popup.opened) {