From b63feb5eaa8d5d706795387908b1bfab1db54de8 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Sat, 31 Oct 2026 13:55:03 -0400 Subject: [PATCH] fix: three-finger tap opens the keyboard in touchpad mode (#1903) --- .../com/droiddeck/launcher/SessionActivity.kt | 4 ++++ .../droiddeck/launcher/input/PointerGestures.kt | 1 + .../droiddeck/launcher/input/TouchpadGestures.kt | 3 ++- .../launcher/input/TouchpadGesturesTest.kt | 16 ++++++++++++++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 2f3d2f189c..9b8a6f9727 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2836,6 +2836,10 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { override fun onWheel(steps: Int) { sendSceneWheel(steps) } override fun onScroll(dx: Float, dy: Float) = fingerScroll(dx, dy) override fun onScrollEnd() = fingerScrollEnd() + override fun onThreeFingerTap(): Boolean { + uiHandler.post { togglePcKeyboard() } + return true + } override fun onZoom(steps: Int) { WaylandCompositor.nativeSendKey(KEY_LEFTCTRL, 1) sendSceneWheel(steps) diff --git a/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt index 74b50a4526..ca1ec046a6 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/PointerGestures.kt @@ -11,6 +11,7 @@ class PointerGestures { fun onScroll(dx: Float, dy: Float) {} fun onScrollEnd() {} fun onZoom(steps: Int) {} + fun onThreeFingerTap(): Boolean = false } companion object { diff --git a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt index b03cd03b61..ed4e87732b 100644 --- a/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt +++ b/app/src/main/java/com/droiddeck/launcher/input/TouchpadGestures.kt @@ -240,7 +240,8 @@ class TouchpadGestures( } if (desktop && scrolled && event.pointerCount == 2) listener.onScrollEnd() if (fingers >= 3) { - if (event.pointerCount == 2 && secondWasTap && !scrolled && event.eventTime - downAt < TouchTiming.TAP_MS * 2) + if (event.pointerCount == 2 && secondWasTap && !scrolled && event.eventTime - downAt < TouchTiming.TAP_MS * 2 && + !listener.onThreeFingerTap()) click(PointerGestures.BTN_MIDDLE) if (event.pointerCount == 2) secondWasTap = false } else if (twoFingers && secondWasTap && event.eventTime - secondDownAt < TouchTiming.TAP_MS && !scrolled) { diff --git a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt index 79c1398588..2b84e3ae4d 100644 --- a/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/input/TouchpadGesturesTest.kt @@ -33,7 +33,9 @@ class TouchpadGesturesTest { override fun onScroll(dx: Float, dy: Float) { events += "scroll" } override fun onScrollEnd() { events += "scroll end" } override fun onZoom(steps: Int) { events += "zoom $steps" } + override fun onThreeFingerTap(): Boolean { events += "three tap"; return claimThreeTap } } + private var claimThreeTap = false @Before fun setUp() { touchpad = TouchpadGestures(SLOP, listener) @@ -50,7 +52,18 @@ class TouchpadGesturesTest { assertEquals(listOf("left down", "left up"), events) } - @Test fun threeFingerTapClicksTheMiddleButton() { + @Test fun threeFingerTapClicksTheMiddleButtonWhenUnclaimed() { + threeFingerTap() + assertEquals(listOf("three tap", "middle down", "middle up"), events) + } + + @Test fun claimedThreeFingerTapSkipsTheMiddleButton() { + claimThreeTap = true + threeFingerTap() + assertEquals(listOf("three tap"), events) + } + + private fun threeFingerTap() { touch(MotionEvent.ACTION_DOWN, 0, 1 to (400f to 300f)) advance(10) touch(MotionEvent.ACTION_POINTER_DOWN, 1, 1 to (400f to 300f), 2 to (600f to 310f)) @@ -61,7 +74,6 @@ class TouchpadGesturesTest { touch(MotionEvent.ACTION_POINTER_UP, 1, 1 to (400f to 300f), 2 to (600f to 310f)) touch(MotionEvent.ACTION_UP, 0, 1 to (400f to 300f)) advance(100) - assertEquals(listOf("middle down", "middle up"), events) } @Test fun desktopTwoFingerSlideScrollsSmoothlyAndStops() {