diff --git a/qml/opaque b/qml/opaque index dab30aa1..a9d5302d 160000 --- a/qml/opaque +++ b/qml/opaque @@ -1 +1 @@ -Subproject commit dab30aa1643cf21cd2c0bd6928a2edbf0952cffa +Subproject commit a9d5302d150b942998050aa04abf978993f7c641 diff --git a/qml/widgets/MessageEditor.qml b/qml/widgets/MessageEditor.qml index 4d1da732..ec7cceab 100644 --- a/qml/widgets/MessageEditor.qml +++ b/qml/widgets/MessageEditor.qml @@ -117,8 +117,10 @@ ColumnLayout { property bool skipOneUpdate: false property int previousCursor - Keys.onReturnPressed: { // CTRL+ENTER = LINEBREAK // TODO: Broken - if ((event.modifiers & Qt.ShiftModifier) && gcd.os != "android") { + Keys.onReturnPressed: { + if (gcd.os == "android") return + + if (event.modifiers & Qt.ShiftModifier) { txtMessage.insert(txtMessage.cursorPosition, "\n") } else if (event.modifiers == Qt.NoModifier) { btnSend.clicked()