From 3971f673ca129fae8f5f02da7a7be5514b09e9f8 Mon Sep 17 00:00:00 2001 From: Alex Tyrer Date: Wed, 6 Nov 2024 11:09:34 +0000 Subject: [PATCH 1/4] [Input System] The "Add Control Scheme..." popup now requires explicit Save/Close user action (case ISXB-1131) o Previously clicking outside the popup window (anywhere in the editor) would close the popup window. o This would leave a new blank (unnamed, orphaned) control scheme populating the UI - this was confusing. o Now this popup will persist until the user explictly chooses to Save or Cancel. --- .../Editor/UITKAssetEditor/Views/ControlSchemesView.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs index 86db5db1d5..e6e7e58e5f 100644 --- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs +++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ControlSchemesView.cs @@ -63,7 +63,6 @@ public ControlSchemesView(VisualElement root, StateContainer stateContainer, boo m_ModalWindow.Add(popupWindow); root.Add(m_ModalWindow); m_ModalWindow.StretchToParentSize(); - m_ModalWindow.RegisterCallback(evt => CloseView()); popupWindow.RegisterCallback(evt => evt.StopPropagation()); m_ListView = controlSchemeVisualElement.Q(kControlSchemesListView); From 729a57be706490f55a52510fafc9d6b7c366908d Mon Sep 17 00:00:00 2001 From: Alex Tyrer Date: Wed, 6 Nov 2024 11:30:59 +0000 Subject: [PATCH 2/4] [Input System] Added CHANGELOG entry for "Add Control Scheme..." popup fix (case ISXB-1131) --- Packages/com.unity.inputsystem/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 5df223e59d..6dbcb39a8f 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -18,6 +18,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed ISubmitHandler.OnSubmit event processing when operating in Manual Update mode (ISXB-1141) - Fixed Rename mode is not entered and name is autocompleted to default when creating a new Action Map on 2022.3. [ISXB-1151](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1151) - Fixed unexpected control scheme switch when using `OnScreenControl` and pointer based schemes which registed "Cancel" event on every frame.[ISXB-656](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-656) +- Fixed an issue with The "Add Control Scheme..." popup window so that it now persists until any changes are explicitly Saved or Cancelled [case ISXB-1131](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1131)) ### Changed - Added back the InputManager to InputSystem project-wide asset migration code with performance improvement (ISX-2086) From 74b86e1affe23e9d920c294197de8ce7bad3e416 Mon Sep 17 00:00:00 2001 From: Alex Tyrer Date: Wed, 6 Nov 2024 13:58:34 +0000 Subject: [PATCH 3/4] [Input System] Fix typo in CHANGELOG entry - removed extraneous final closing parenthesis. --- Packages/com.unity.inputsystem/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md index 6dbcb39a8f..caf4b4ec58 100644 --- a/Packages/com.unity.inputsystem/CHANGELOG.md +++ b/Packages/com.unity.inputsystem/CHANGELOG.md @@ -18,7 +18,7 @@ however, it has to be formatted properly to pass verification tests. - Fixed ISubmitHandler.OnSubmit event processing when operating in Manual Update mode (ISXB-1141) - Fixed Rename mode is not entered and name is autocompleted to default when creating a new Action Map on 2022.3. [ISXB-1151](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1151) - Fixed unexpected control scheme switch when using `OnScreenControl` and pointer based schemes which registed "Cancel" event on every frame.[ISXB-656](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-656) -- Fixed an issue with The "Add Control Scheme..." popup window so that it now persists until any changes are explicitly Saved or Cancelled [case ISXB-1131](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1131)) +- Fixed an issue with The "Add Control Scheme..." popup window so that it now persists until any changes are explicitly Saved or Cancelled [case ISXB-1131](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1131) ### Changed - Added back the InputManager to InputSystem project-wide asset migration code with performance improvement (ISX-2086) From 82c40ad6d6a7d3b7c89f6825d6f88bf3ac0f77fb Mon Sep 17 00:00:00 2001 From: Alex Tyrer Date: Wed, 6 Nov 2024 15:01:08 +0000 Subject: [PATCH 4/4] [Input System] Licensing failure - try limiting to version 2021.3.45f --- .yamato/config.metadata | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index fb0b5355cf..4e88db5dc1 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -1,5 +1,5 @@ editors: - - version: 2021.3 + - version: 2021.3.45f - version: 2022.3 disable_tvos_run: true - version: 6000.0