From e4a4775be53082cb4c259a8ed24022cd70703afd Mon Sep 17 00:00:00 2001 From: MaxsTechReview Date: Sat, 7 Nov 2026 23:24:53 -0500 Subject: [PATCH] fix(input): taps outside the PC keyboard reach the game while it is open (#2257) * fix(input): taps outside the PC keyboard reach the game while it is open * fix(input): the game's cursor stays visible while only the PC keyboard is open * fix(input): a touch cancelled mid-stream stays closed until the finger lifts * A resize also ends a pending two-finger touch * A new touch clears a dismissal left by a stream that ended elsewhere * A new touch is not held back by a three-finger tap whose end was consumed --- .../com/droiddeck/launcher/SessionActivity.kt | 19 ++++++++++++++++--- 1 file changed, 16 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 4d22ffff65..86e57cd4fe 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -981,7 +981,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } } else { com.droiddeck.launcher.ui.FocusGlideHost(androidx.compose.ui.Modifier.fillMaxSize()) { - CursorOverlay({ cursorPos }, cursorVisible && !uiPointer && !bottomOutputActive, + CursorOverlay({ cursorPos }, cursorVisible && (!uiPointer || onlyPcKeyboardOpen()) && !bottomOutputActive, resources.displayMetrics.density, cursorImage, cursorHotX, cursorHotY, cursorImageScale) if (memoryHud.text.isNotEmpty()) HudText(memoryHud.text, hudColor, hudOpacity) @@ -2321,9 +2321,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::touchscreenGestures.isInitialized) touchscreenGestures.cancel() if (::touchpad.isInitialized) touchpad.cancel() if (::directTouchHold.isInitialized) directTouchHold.cancel() + if (::twoFingerGestures.isInitialized) twoFingerGestures.cancel() if (::scrollTouch.isInitialized) scrollTouch.cancel() scrollTouchGesture = false gesturePointerReady = false + if (sessionTouchDown) dismissTouch = true } private fun panelBounds(): android.graphics.Rect = if (Build.VERSION.SDK_INT >= 30) { @@ -3965,9 +3967,17 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var lockedSwipeX = 0f private var lockedSwipeY = 0f private var dismissTouch = false + private var sessionTouchDown = false override fun onTouchEvent(event: MotionEvent): Boolean { if (event.isFromSource(android.view.InputDevice.SOURCE_MOUSE)) return onMouse(event) + when (event.actionMasked) { + MotionEvent.ACTION_DOWN -> { + sessionTouchDown = true + dismissTouch = false + } + MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> sessionTouchDown = false + } if (drawerOpen && drawerDocked && event.actionMasked == MotionEvent.ACTION_DOWN) { drawerLayerOpen = false drawerOpenState = false @@ -3979,7 +3989,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (event.actionMasked == MotionEvent.ACTION_UP || event.actionMasked == MotionEvent.ACTION_CANCEL) dismissTouch = false return true } - val uiBlocking = drawerOpen || pcKeyboardOpen || achievementsOpen || gestureSettingsOpen || inputSettingsOpen || pipUi || SessionState.suspended + val uiBlocking = drawerOpen || achievementsOpen || gestureSettingsOpen || inputSettingsOpen || pipUi || SessionState.suspended if (event.actionMasked == MotionEvent.ACTION_DOWN && !uiBlocking && routedTouchMode != SessionPrefs.TOUCH_GESTURES) { scrollTouchGesture = scrollTouchMode() scrollRestX = 0f @@ -4007,7 +4017,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { com.droiddeck.launcher.input.TouchRouter.Route.SCROLL -> scrollTouch.onTouch(event) else -> { if (com.droiddeck.launcher.input.TouchRouter.steamKeyboardZone(snapshot)) { - val wasActive = threeFingerTap.active + val wasActive = threeFingerTap.active && event.actionMasked != MotionEvent.ACTION_DOWN if (threeFingerTap.onTouch(event)) padBridge?.triggerSteamKeyboard() if (threeFingerTap.active && !wasActive) { if (route == com.droiddeck.launcher.input.TouchRouter.Route.TOUCHPAD) touchpad.cancel() @@ -4203,6 +4213,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { applyPlatformPointer(appUiOwnsPointer()) } + private fun onlyPcKeyboardOpen(): Boolean = + pcKeyboardOpen && !drawerOpen && !achievementsOpen && !inputSettingsOpen && !pipUi && !glassesOutputActive && !touchEditorOpen && !wowChatOnTop + private fun appUiOwnsPointer(): Boolean = drawerOpen || pcKeyboardOpen || achievementsOpen || inputSettingsOpen || pipUi || glassesOutputActive || bottomOutputActive || touchEditorOpen || wowChatOnTop