Skip to content

FIX: Submit and Cancel actions should obey configured interactions. #1956

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 3 commits into from
Jul 1, 2024
Merged

FIX: Submit and Cancel actions should obey configured interactions. #1956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6e8ad2
changed Submit and Cancel actions to use WasPerformed instead of
smnwttbr Jun 25, 2024
db8c643
Merge branch 'develop' into isxb-841-submit-and-cancel-should-obey-in…
ekcoh Jun 28, 2024
5db7ad8
Merge branch 'develop' into isxb-841-submit-and-cancel-should-obey-in…
smnwttbr Jul 1, 2024
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
2 changes: 2 additions & 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 @@ -29,9 +29,11 @@ however, it has to be formatted properly to pass verification tests.
- Fixed a performance issue with many objects using multiple action maps [ISXB-573](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-573).
- Fixed an variable scope shadowing issue causing compilation to fail on Unity 2019 LTS.
- Fixed an issue where changing `InputSettings` instance would not affect associated feature flags.
- Submit and Cancel UI actions will now respect configured interactions. [ISXB-841](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-841).
- Fixed the UI generation of enum fields when editing interactions of action properties. The new selected value was lost when saving.
- Fixed the UI generation of custom interactions of action properties when it rely on OnGUI callback. [ISXB-886](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-886).


### Added
- Added additional device information when logging the error due to exceeding the maximum number of events processed
set by `InputSystem.settings.maxEventsBytesPerUpdate`. This additional information is available in development builds
Expand Down
4 changes: 2 additions & 2 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 @@ -709,9 +709,9 @@ internal void ProcessNavigation(ref NavigationModel navigationState)
var cancelAction = m_CancelAction?.action;

var data = GetBaseEventData();
if (cancelAction != null && cancelAction.WasPressedThisFrame())
if (cancelAction != null && cancelAction.WasPerformedThisFrame())
ExecuteEvents.Execute(eventSystem.currentSelectedGameObject, data, ExecuteEvents.cancelHandler);
if (!data.used && submitAction != null && submitAction.WasPressedThisFrame())
if (!data.used && submitAction != null && submitAction.WasPerformedThisFrame())
ExecuteEvents.Execute(eventSystem.currentSelectedGameObject, data, ExecuteEvents.submitHandler);
}
}
Expand Down