From 113ba7b77c22515c4c084a7c445f9b0e8c44a91f Mon Sep 17 00:00:00 2001 From: Dantalian Date: Sun, 1 Nov 2026 05:38:54 +0800 Subject: [PATCH] fix: keep each key cap's gesture keyed and make the default size selectable --- .../com/droiddeck/launcher/ui/PcKeyboard.kt | 20 ++++++++++++------- .../droiddeck/launcher/ui/SessionOverlay.kt | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt index a5b194ab50..5c40727031 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/PcKeyboard.kt @@ -36,6 +36,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.key import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateMapOf import androidx.compose.runtime.mutableStateOf @@ -136,11 +137,13 @@ fun PcKeyboard( key.label.length == 1 && key.label[0].isLetter() && (shifted xor capsOn) -> key.label.uppercase() else -> key.label } - KeyCap( - label, key.weight, lit, locked = state == MOD_LOCKED, - modifier = if (r == 0 && i == 0) Modifier.focusRequester(firstKey) else Modifier, - onDown = { press(key) }, onUp = { release(key) }, - ) + key(key.code) { + KeyCap( + label, key.weight, lit, locked = state == MOD_LOCKED, + modifier = if (r == 0 && i == 0) Modifier.focusRequester(firstKey) else Modifier, + onDown = { press(key) }, onUp = { release(key) }, + ) + } } } } @@ -174,8 +177,11 @@ private fun RowScope.KeyCap( awaitEachGesture { awaitFirstDown().consume() down = true; onDown() - waitForUpOrCancellation()?.consume() - down = false; onUp() + try { + waitForUpOrCancellation()?.consume() + } finally { + down = false; onUp() + } } } .onPreviewKeyEvent { e -> diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index 43e3fc5c4a..1f595ec6ea 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -677,7 +677,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont remember { PcKeyboardPrefs.load(keyboardContext) } SliderRow( stringResource(R.string.pckb_size), stringResource(R.string.pckb_size_hint), - PcKeyboardPrefs.size, SessionPrefs.PC_KEYBOARD_SIZE_RANGE, step = 5, + PcKeyboardPrefs.size, SessionPrefs.PC_KEYBOARD_SIZE_RANGE, step = 1, format = { "$it%" }, modifier = focus.track(page, "pckb-size"), onChange = { PcKeyboardPrefs.setSize(keyboardContext, it) }) SliderRow(