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

Merge branch 'Windows_send_fix' into 'master'

Browse source 
Fix send message logic bug introduced with shift+enter setting

See merge request nheko-reborn/nheko!23
This commit is contained in:
Nicolas Werner 2022-12-29 00:08:05 +00:00
commit 34203b5349
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/MessageInput.qml
View file

@ -219,7 +219,7 @@ Rectangle {
} else if (event.matches(StandardKey.InsertLineSeparator)) { } else if (event.matches(StandardKey.InsertLineSeparator)) {
if (popup.opened) popup.close(); 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(); room.input.send();
event.accepted = true; event.accepted = true;
} }
@ -234,7 +234,7 @@ Rectangle {
return; return;
} }
} }
if (!Settings.invertEnterKey && !Qt.inputMethod.visible || Qt.platform.os === "windows") { if (!Settings.invertEnterKey && (!Qt.inputMethod.visible || Qt.platform.os === "windows")) {
room.input.send(); room.input.send();
event.accepted = true; event.accepted = true;
} }