Skip to content

Commit

Permalink
send on enter tweak
Browse files Browse the repository at this point in the history
  • Loading branch information
@zoff99
zoff99 committed Oct 22, 2023
1 parent 9dbb8e7 commit ec903c5
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 16 deletions.
22 changes: 14 additions & 8 deletions src/main/kotlin/com/zoffcc/applications/trifa2/GroupSendMessage.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,26 @@ fun GroupSendMessage(sendGroupMessage: (String) -> Unit) {
.focusRequester(textFieldFocusRequester)
.onPreviewKeyEvent {
when {
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyUp) -> {
sendGroupMessage(inputText)
inputText = ""
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyDown) -> {
if (inputText.isNotEmpty())
{
sendGroupMessage(inputText)
inputText = ""
}
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyUp) -> {
sendGroupMessage(inputText)
inputText = ""
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyDown) -> {
if (inputText.isNotEmpty())
{
sendGroupMessage(inputText)
inputText = ""
}
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyDown) -> {
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyUp) -> {
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyDown) -> {
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyUp) -> {
true
}
else -> false
Expand Down
22 changes: 14 additions & 8 deletions src/main/kotlin/com/zoffcc/applications/trifa2/SendMessage.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,26 @@ fun SendMessage(sendMessage: (String) -> Unit) {
.focusRequester(textFieldFocusRequester)
.onPreviewKeyEvent {
when {
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyUp) -> {
sendMessage(inputText)
inputText = ""
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyDown) -> {
if (inputText.isNotEmpty())
{
sendMessage(inputText)
inputText = ""
}
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyUp) -> {
sendMessage(inputText)
inputText = ""
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyDown) -> {
if (inputText.isNotEmpty())
{
sendMessage(inputText)
inputText = ""
}
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyDown) -> {
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyUp) -> {
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyDown) -> {
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyUp) -> {
true
}
else -> false
Expand Down

0 comments on commit ec903c5

Please sign in to comment.