Ignore AWT mouse events during window resize #949
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MatkovIvan
reviewed
Dec 18, 2023
| @@ -279,9 +279,43 @@ internal abstract class ComposeBridge( | |||
| }) | |||
| } | |||
|
|
|||
| // Decides which AWT events should be delivered, and which should be filtered out | |||
| private val awtEventFilter = object { | |||
There was a problem hiding this comment.
Why do we need an extra object here? It seems like it can be just private functions
There was a problem hiding this comment.
We don't need it, but I think it's cleaner to bundle it into a "filter" object.
There was a problem hiding this comment.
This also looks cleaner to me
| return !isDisposed | ||
| } | ||
| } | ||
|
|
||
| private fun onMouseEvent(event: MouseEvent): Unit = catchExceptions { |
There was a problem hiding this comment.
It's called from several places including mouseEntered/mouseExited events, so it looks like we need to filter it only there and drop additional bool storage
There was a problem hiding this comment.
We need to know the current pressed state of the primary mouse button in order to filter correctly.
igordmn
reviewed
Dec 19, 2023
compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposeBridge.desktop.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposeBridge.desktop.kt
Outdated
Show resolved
Hide resolved
| @@ -279,9 +279,43 @@ internal abstract class ComposeBridge( | |||
| }) | |||
| } | |||
|
|
|||
| // Decides which AWT events should be delivered, and which should be filtered out | |||
| private val awtEventFilter = object { | |||
There was a problem hiding this comment.
This also looks cleaner to me
compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposeBridge.desktop.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposeBridge.desktop.kt
Outdated
Show resolved
Hide resolved
compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/awt/ComposeBridge.desktop.kt
Outdated
Show resolved
Hide resolved
igordmn
approved these changes
Dec 19, 2023
m-sasha
force-pushed
the
m-sasha/filter-awt-mouse-events
branch
from
b361f3d
to
d4749a5
Compare
igordmn
approved these changes
Dec 19, 2023
…the primary mouse button, but aren't mouse press/release events.
…e press/release events.
m-sasha
force-pushed
the
m-sasha/filter-awt-mouse-events
branch
from
d4749a5
to
55ee365
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While resizing the window by dragging it by its edge, AWT (at least on macOS) sends mouse enter/exit events that report the primary button as pressed. This causes
PointerInputScope.detectTapAndPressto falsely detect a tap.Proposed Changes
Ignore mouse events that signal a change in the pressed state of the primary mouse button, but aren't mouse press/release events.
Testing
Test: tested manually that resizing the window no longer triggers
PointerInputScope.detectTapAndPress.Issues Fixed
Fixes: JetBrains/compose-multiplatform#2850