-
Notifications
You must be signed in to change notification settings - Fork 330
CHANGE: Restructured main Input System Package settings nodes #1791
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.
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
Conversation
…put Actions and Settings to be a child node when Project Wide Actions are available.
jamesmcgill
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should be tested to make sure existing projects with InputSettings still use those settings in the Player.
Otherwise lgtm.
|
@jamesmcgill Cannot see why the UI structure path would affect that but why not test it. |
Pauliusd01
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM (?) Here's what I checked (Tested on both 2020.3 and latest trunk Editor):
- Checked that Input Manager, Input System Settings tabs still work correctly (Input Manager tab still had the UUM-53925 bug but this should already be fixed in up to date Editors)
- Checked that Input System Settings asset Edit button works and takes you to the right place
- Checked that PlayerInput and Input SystemUI module components still find ProjectWideActions correctly when selecting it in the dropdown and that its open button works
Things I have to note, I noticed that on the trunk Editor I can sometimes get this UITK error when pressing "Open Input Settings Window" for the input settings asset:
Expected a visual element called 'control-schemes-toolbar-menu' of type 'UnityEditor.UIElements.ToolbarMenu' to exist but none was found.
UnityEngine.Debug:ExtractStackTraceNoAlloc (byte*,int,string)
UnityEngine.StackTraceUtility:ExtractStackTrace () (at D:/Gitrepo/unity/Runtime/Export/Scripting/StackTrace.cs:37)
UnityEngine.DebugLogHandler:Internal_Log (UnityEngine.LogType,UnityEngine.LogOption,string,UnityEngine.Object)
UnityEngine.DebugLogHandler:LogFormat (UnityEngine.LogType,UnityEngine.Object,string,object[])
UnityEngine.Logger:Log (UnityEngine.LogType,object)
UnityEngine.Debug:LogError (object)
UnityEngine.InputSystem.Editor.StateContainer:<Dispatch>b__6_0 () (at ./Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/StateContainer.cs:49)
UnityEngine.UIElements.VisualElement/SimpleScheduledItem:PerformTimerUpdate (UnityEngine.UIElements.TimerState) (at D:/Gitrepo/unity/Modules/UIElements/Core/VisualElementScheduler.cs:346)
UnityEngine.UIElements.TimerEventScheduler:UpdateScheduledEvents () (at D:/Gitrepo/unity/Modules/UIElements/Core/Scheduler.cs:363)
UnityEngine.UIElements.UIElementsUtility:UnityEngine.UIElements.IUIElementsUtility.UpdateSchedulers () (at D:/Gitrepo/unity/Modules/UIElements/Core/UIElementsUtility.cs:273)
UnityEngine.UIElements.UIEventRegistration:UpdateSchedulers () (at D:/Gitrepo/unity/Modules/UIElements/Core/UIElementsUtility.cs:105)
UnityEditor.RetainedMode:UpdateSchedulers () (at D:/Gitrepo/unity/Modules/UIElementsEditor/RetainedMode.cs:55)
Do you think this could be related to your changes? It sounded so generic so I brushed it off but still mentioning anyway just in case
|
@Pauliusd01 I believe that log message is not related to changes on this branch, but rather to our uxml setup, I believe we should file it separately |
|
@Pauliusd01 I filed ISX-1721 with the issue you reported. Assigned it to you if you have additional information. |
…oject wide actions are available (#1791) * CHANGE: Restructured main Input System Package settings node to be Input Actions and Settings to be a child node when Project Wide Actions are available.
Description
Restructured main Input System Package settings node to be Input Actions and Settings to be a child node when Project Wide Actions are available. If Project Wide Actions is not available structure is unchanged.
This implements ISX-1554.
Changes made
Extracted common settings path string into its own constant.
Introduced preconditional compile time checks to use different paths depending on Project Wide Actions availability derived from preprocessor symbol defines.
Notes
Recommendations for QA/testing:
Unfortunately not covered by automated tests.
Checklist
Before review:
Changed,Fixed,Addedsections.([case %number%](https://issuetracker.unity3d.com/issues/...)).Area_CanDoX,Area_CanDoX_EvenIfYIsTheCase,Area_WhenIDoX_AndYHappens_ThisIsTheResult.During merge:
NEW: ___.FIX: ___.DOCS: ___.CHANGE: ___.RELEASE: 1.1.0-preview.3.