Skip to content

Bug fix 20251231 #1868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bambooin merged 2 commits into from
Dec 31, 2025
Merged

Bug fix 20251231 #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f9376f
fix: prevent `long_click` during slide gesture
ENOA-ANSUL-EDEN Dec 29, 2025
ff3f25c
fix: restore haptic feedback for long press gestures
ENOA-ANSUL-EDEN Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/com/osfans/trime/ime/keyboard/GestureFrame.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ open class GestureFrame(context: Context) : FrameLayout(context) {
private var longPressJob: Job? = null

@Volatile
var longPressFeedbackEnabled = false
var longPressFeedbackEnabled = true

@Volatile
private var swipeTriggered = false
Expand Down Expand Up @@ -105,10 +105,10 @@ open class GestureFrame(context: Context) : FrameLayout(context) {
delay(longPressTimeout.toLong())
if (touchId != currentTouchId) return@launch
if (!(swipeTriggered || longPressTriggered || shouldPerformSwipe)) {
if (longPressFeedbackEnabled) {
longPressTriggered = performLongClick()
if (longPressFeedbackEnabled && longPressTriggered) {
InputFeedbackManager.keyPressVibrate(this@GestureFrame, true)
}
longPressTriggered = performLongClick()
}
}
swipeStartX = x
Expand Down
13 changes: 8 additions & 5 deletions app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardGestureFrame.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ open class KeyboardGestureFrame(context: Context) : FrameLayout(context) {

if (state.isLongPressed) {
onPopupSelected?.invoke(keyIndex)
deactivateKeyFeedback(keyIndex)
deactivateKeyFeedback(keyIndex, KeyBehavior.LONG_CLICK)
return true
}

Expand Down Expand Up @@ -250,13 +250,16 @@ open class KeyboardGestureFrame(context: Context) : FrameLayout(context) {
val keyIndex = state.keyIndex
state.longPressJob = lifecycleScope.launch {
delay(longPressTimeout.toLong())
if (activePointers.get(pointerId) != state || state.shouldPerformSwipe) return@launch
if (activePointers.get(pointerId) != state || state.shouldPerformSwipe || state.slideActivated) return@launch
state.isLongPressed = true
if (isKeyRepeatable(keyIndex)) {
onKeyActionListener?.invoke(keyIndex, KeyBehavior.CLICK)
launchRepeatClickJob(pointerId, state)
} else {
if (onKeyActionListener?.invoke(keyIndex, KeyBehavior.LONG_CLICK) == true) deactivateKeyFeedback(keyIndex)
if (onKeyActionListener?.invoke(keyIndex, KeyBehavior.LONG_CLICK) == true) {
deactivateKeyFeedback(keyIndex, KeyBehavior.LONG_CLICK)
activePointers.delete(pointerId)
}
}
}
}
Expand Down Expand Up @@ -307,8 +310,8 @@ open class KeyboardGestureFrame(context: Context) : FrameLayout(context) {
onKeyStateListener?.invoke(keyIndex, behavior, true, false, false)
}

private fun deactivateKeyFeedback(keyIndex: Int) {
onKeyStateListener?.invoke(keyIndex, KeyBehavior.CLICK, false, false, false)
private fun deactivateKeyFeedback(keyIndex: Int, behavior: KeyBehavior = KeyBehavior.CLICK) {
onKeyStateListener?.invoke(keyIndex, behavior, false, false, false)
}

private val touchPaint by lazy {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/osfans/trime/ime/keyboard/KeyboardView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ class KeyboardView(

onKeyActionListener = { keyIndex, behavior ->
if (behavior == KeyBehavior.LONG_CLICK && hasPopupKeys(keyIndex)) {
keyboardActionListener?.onPress(keyIndex, false)
val popupKeys = mKeys.get(keyIndex).popup
val bounds = getKeyBounds(keyIndex)
popupActionListener.onPopupAction(
Expand Down Expand Up @@ -172,7 +173,7 @@ class KeyboardView(
key?.onReleased()
invalidateKey(key)
hidePopup(keyIndex)
if (vibrateOnKeyRelease) keyboardActionListener?.onPress(keyIndex, false)
if (behavior == KeyBehavior.LONG_CLICK || vibrateOnKeyRelease) keyboardActionListener?.onPress(keyIndex, false)
}
}
}
Expand Down
Loading