Merge branch 'Windows_send_fix' into 'master'
Fix send message logic bug introduced with shift+enter setting See merge request nheko-reborn/nheko!23
This commit is contained in:
commit
34203b5349
@ -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;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user