Skip to content

FIX: Reset ButtonStates when re-using eventData with SingleUnifiedPointer #2139

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
merged 7 commits into from
Mar 5, 2025
Merged

FIX: Reset ButtonStates when re-using eventData with SingleUnifiedPointer #2139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
88514ee
Update CHANGELOG.md
tspiller Jan 21, 2025
98fe22a
Set pointer buttons back to default so the values are properly based …
tspiller Jan 20, 2025
f5b872b
Merge branch 'develop' into isxb-1356-reset-pointer-singleunifiedpoin…
tspiller Feb 19, 2025
41bd3b7
Update CHANGELOG.md
tspiller Feb 19, 2025
3479b33
Merge branch 'develop' into isxb-1356-reset-pointer-singleunifiedpoin…
tspiller Feb 25, 2025
5aef115
Merge branch 'develop' into isxb-1356-reset-pointer-singleunifiedpoin…
tspiller Mar 4, 2025
46dfb62
Merge branch 'develop' into isxb-1356-reset-pointer-singleunifiedpoin…
tspiller Mar 5, 2025
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
1 change: 1 addition & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ however, it has to be formatted properly to pass verification tests.

### Fixed
- Fixed an issue where all action maps were enabled initially for project wide actions, which overrode the PlayerInput action map configuration. [ISXB-920](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-920)
- Fixed an issue where ButtonStates are not fully updated when switching SingleUnifiedPointer. [ISXB-1356](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1356)

### Changed
- Changed enum value `Key.IMESelected` to obsolete which was not a real key. Please use the ButtonControl `imeSelected`.
Expand Down
9 changes: 9 additions & 0 deletions Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1931,6 +1931,15 @@ private int GetPointerStateIndexFor(InputControl control, bool createIfNotExists
// Make sure these don't linger around when we switch to a different kind of pointer.
eventData.trackedDeviceOrientation = default;
eventData.trackedDevicePosition = default;

// We only have a single pointer state and current frame press state values was based on previous eventData.
// Make sure these get updated when we switch.
if (m_PointerBehavior == UIPointerBehavior.SingleUnifiedPointer)
{
pointer.leftButton.OnEndFrame();
pointer.rightButton.OnEndFrame();
pointer.middleButton.OnEndFrame();
}
}

if (pointerType == UIPointerType.Touch)
Expand Down