dox4/fcitx5-android
1
0
Fork 0
mirror of https://github.com/fcitx5-android/fcitx5-android.git synced 2026-08-02 20:16:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rework how key presses and popup actions are handled

Browse Source
This commit is contained in:
ketal 2025-05-11 02:17:35 +08:00
parent f7619b4ed0
commit b24280c815
No known key found for this signature in database
GPG Key ID: 52E91FA93DA527DA
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/fcitx/fcitx5/android/input/keyboard/BaseKeyboard.kt
View File

@ -85,7 +85,8 @@ abstract class BaseKeyboard(
*/
private val touchTarget = hashMapOf<Int, View>()
private var keyActionBuffer: KeyAction? = null
private data class KeyActionState(val viewId: Int, val action: KeyAction)
private var keyActionStateBuffer: KeyActionState? = null
init {
isMotionEventSplittingEnabled = true
@ -212,17 +213,24 @@ abstract class BaseKeyboard(
is KeyDef.Behavior.Press -> {
keyPressListener = object : CustomGestureView.KeyPressListener {
override fun onKeyDown(view: CustomGestureView) {
keyActionBuffer?.let { action -> onAction(action) }
keyActionBuffer = it.action
keyActionStateBuffer?.let { state ->
onAction(state.action)
keyActionStateBuffer = null
}
keyActionStateBuffer = KeyActionState(view.id, it.action)
}
override fun onKeyUp(view: CustomGestureView) {
keyActionBuffer?.let { action ->
onAction(action)
keyActionBuffer = null
keyActionStateBuffer?.let { state ->
if (view.id == state.viewId) {
onAction(state.action)
keyActionStateBuffer = null
}
}
}
override fun onLongPress(view: CustomGestureView) {
keyActionBuffer = null
if (view.id == keyActionStateBuffer?.viewId) {
keyActionStateBuffer = null
}
}
}
}
@ -294,7 +302,10 @@ abstract class BaseKeyboard(
is KeyDef.Popup.Keyboard -> {
setOnLongClickListener { view ->
view as KeyView
onPopupAction(PopupAction.ShowKeyboardAction(view.id, it, view.bounds))
// only last key pressed will show the popup
if (view.id == keyActionStateBuffer?.viewId) {
onPopupAction(PopupAction.ShowKeyboardAction(view.id, it, view.bounds))
}
// do not consume this LongClick gesture
false
}