summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2022-12-29 00:08:05 +0000
committerNicolas Werner <nicolas.werner@hotmail.de>2022-12-29 00:08:05 +0000
commit34203b53490a1c62e595c9dc56db61476439ffad (patch)
tree9fe8a8b8b165a8e455ed4a8c91ee42369f2846a2
parentSkip notifying for your own messages (diff)
parentFix send message logic bug introduced with shift+enter setting (diff)
downloadnheko-34203b53490a1c62e595c9dc56db61476439ffad.tar.xz
Merge branch 'Windows_send_fix' into 'master'
Fix send message logic bug introduced with shift+enter setting

See merge request nheko-reborn/nheko!23
-rw-r--r--resources/qml/MessageInput.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/resources/qml/MessageInput.qml b/resources/qml/MessageInput.qml

index 7f5f63ec..ab6e260f 100644 --- a/resources/qml/MessageInput.qml +++ b/resources/qml/MessageInput.qml
@@ -219,7 +219,7 @@ Rectangle { } else if (event.matches(StandardKey.InsertLineSeparator)) { if (popup.opened) popup.close(); - if (Settings.invertEnterKey && !Qt.inputMethod.visible || Qt.platform.os === "windows") { + if (Settings.invertEnterKey && (!Qt.inputMethod.visible || Qt.platform.os === "windows")) { room.input.send(); event.accepted = true; } @@ -234,7 +234,7 @@ Rectangle { return; } } - if (!Settings.invertEnterKey && !Qt.inputMethod.visible || Qt.platform.os === "windows") { + if (!Settings.invertEnterKey && (!Qt.inputMethod.visible || Qt.platform.os === "windows")) { room.input.send(); event.accepted = true; }