Skip to content

Fix input mode switch on pointer input event #2540

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

Draft
wants to merge 1 commit into
base: jb-main
Choose a base branch
from
Draft

Fix input mode switch on pointer input event #2540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 1 deletion compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/node/RootNodeOwner.skiko.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,11 @@ internal class RootNodeOwner(
@OptIn(InternalCoreApi::class)
fun onPointerInput(event: PointerInputEvent): PointerEventResult {
if (event.button != null) {
platformContext.inputModeManager.requestInputMode(InputMode.Touch)
if (event.pointers.any { it.type != PointerType.Touch }) {
platformContext.inputModeManager.requestInputMode(InputMode.Keyboard)
} else {
platformContext.inputModeManager.requestInputMode(InputMode.Touch)
}
}
val isInBounds = event.eventType != PointerEventType.Exit &&
event.pointers.fastAll { isInBounds(it.position) }
Expand Down
2 changes: 1 addition & 1 deletion compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/platform/PlatformContext.skiko.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ interface PlatformContext {
}

companion object {
val Empty = object : PlatformContext {
val Empty get() = object : PlatformContext {
override val windowInfo: WindowInfo = WindowInfoImpl().apply {
// true is a better default if platform doesn't provide WindowInfo.
// otherwise UI will be rendered always in unfocused mode
Expand Down
Loading