From 0eb8d4126b50a2e7d11998dbe60a8d04035827f8 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 25 Nov 2020 02:20:42 +0100
Subject: [PATCH] Fix enter when no completion available
---
resources/qml/MessageInput.qml | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml
index 7a033f5b8..76eac5b30 100644
--- a/resources/qml/MessageInput.qml
+++ b/resources/qml/MessageInput.qml
@@ -117,15 +117,20 @@ Rectangle {
popup.completerName = "";
event.accepted = true;
popup.close();
- } else if (event.matches(StandardKey.InsertParagraphSeparator) && popup.opened) {
- var currentCompletion = popup.currentCompletion();
- popup.completerName = "";
- popup.close();
- if (currentCompletion) {
- textArea.insertCompletion(currentCompletion);
- event.accepted = true;
- return ;
+ } else if (event.matches(StandardKey.InsertParagraphSeparator)) {
+ if (popup.opened) {
+ var currentCompletion = popup.currentCompletion();
+ popup.completerName = "";
+ popup.close();
+ if (currentCompletion) {
+ textArea.insertCompletion(currentCompletion);
+ event.accepted = true;
+ return ;
+ }
}
+ TimelineManager.timeline.input.send();
+ textArea.clear();
+ event.accepted = true;
} else if (event.key == Qt.Key_Tab && popup.opened) {
event.accepted = true;
popup.down();
@@ -135,10 +140,6 @@ Rectangle {
} else if (event.key == Qt.Key_Down && popup.opened) {
event.accepted = true;
popup.down();
- } else if (event.matches(StandardKey.InsertParagraphSeparator)) {
- TimelineManager.timeline.input.send();
- textArea.clear();
- event.accepted = true;
}
}
--
GitLab