Skip to content

Revert "Remove pointerId from ComposeScene" #89

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
Igor Demin (igordmn) merged 1 commit into from
Nov 18, 2021
Merged

Revert "Remove pointerId from ComposeScene" #89

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
Revert "Remove pointerId from ComposeScene"
  • Loading branch information
@igordmn
igordmn authored Nov 18, 2021
commit 373f88020f9d9ef63a6c0c0ac577eaa4deae88ec
11 changes: 6 additions & 5 deletions ...se/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/window/window/WindowInputEventTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,11 +301,12 @@ class WindowInputEventTest {
assertThat(onEnters).isEqualTo(1)
assertThat(onExits).isEqualTo(0)

window.sendMouseEvent(MouseEvent.MOUSE_EXITED, x = 900, y = 500)
awaitIdle()
assertThat(onMoves.size).isEqualTo(2)
assertThat(onEnters).isEqualTo(1)
assertThat(onExits).isEqualTo(1)
// TODO(https://github.com/JetBrains/compose-jb/issues/1176) fix catching exit event
// window.sendMouseEvent(MouseEvent.MOUSE_EXITED, x = 900, y = 500)
// awaitIdle()
// assertThat(onMoves.size).isEqualTo(2)
// assertThat(onEnters).isEqualTo(1)
// assertThat(onExits).isEqualTo(1)

exitApplication()
}
Expand Down
4 changes: 3 additions & 1 deletion compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/ComposeScene.skiko.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ class ComposeScene internal constructor(
*/
val roots: Set<RootForTest> get() = list

private var pointerId = 0L
private var isMousePressed = false

private val job = Job()
Expand Down Expand Up @@ -390,7 +391,7 @@ class ComposeScene internal constructor(
PointerEventType.Release -> isMousePressed = false
}
val event = pointerInputEvent(
eventType, position, timeMillis, nativeEvent, type, isMousePressed, pointerId = 0
eventType, position, timeMillis, nativeEvent, type, isMousePressed, pointerId
)
when (eventType) {
PointerEventType.Press -> onMousePressed(event)
Expand Down Expand Up @@ -462,6 +463,7 @@ class ComposeScene internal constructor(
val owner = (mousePressOwner ?: hoveredOwner) ?: focusedOwner
owner?.processPointerInput(event)
mousePressOwner = null
pointerId += 1
}

private var pointLocation = Offset.Zero
Expand Down