Skip to content

Commit dfb77bc

Browse files
committed
Fixed autorename mode for new action map on pre 6000 version
test ci add changelog
1 parent 43efc3b commit dfb77bc

File tree

6 files changed

+29
-4
lines changed

6 files changed

+29
-4
lines changed

Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// UITK TreeView is not supported in earlier versions
22
// Therefore the UITK version of the InputActionAsset Editor is not available on earlier Editor versions either.
3-
#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS && UNITY_6000_0_OR_NEWER
3+
#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS && UNITY_2022_3_OR_NEWER
44

55
using NUnit.Framework;
66
using System;

Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs.meta

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Tests/InputSystem.Editor/UIToolkitBaseTestWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// UITK TreeView is not supported in earlier versions
22
// Therefore the UITK version of the InputActionAsset Editor is not available on earlier Editor versions either.
3-
#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS && UNITY_6000_0_OR_NEWER
3+
#if UNITY_EDITOR && UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS && UNITY_2022_3_OR_NEWER
44

55
using NUnit.Framework;
66
using System;

Assets/Tests/InputSystem.Editor/UIToolkitBaseTestWindow.cs.meta

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Packages/com.unity.inputsystem/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ however, it has to be formatted properly to pass verification tests.
1515
- Reverted changes from 0ddd534d8 (ISXB-746) which introduced a regression [ISXB-1127](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1127).
1616
- Fixed `ArgumentNullException: Value cannot be null.` during the migration of Project-wide Input Actions from `InputManager.asset` to `InputSystem_Actions.inputactions` asset which lead do the lost of the configuration [ISXB-1105](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1105)
1717
- Fixed pointerId staying the same when simultaneously releasing and then pressing in the same frame on mobile using touch. [ISXB-1006](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-845)
18+
- 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)
1819

1920
### Changed
2021
- Added back the InputManager to InputSystem project-wide asset migration code with performance improvement (ISX-2086)

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionMapsView.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,13 @@ public override void RedrawUI(ViewState viewState)
8888
if (actionMapData.HasValue)
8989
m_ListView.SetSelection(viewState.actionMapData.IndexOf(actionMapData.Value));
9090
}
91+
// UI toolkit doesn't behave the same on 6000.0 way when refreshing items
92+
// On previous versions, we need to call Rebuild() to refresh the items since refreshItems() is less predicatable
93+
#if UNITY_6000_0_OR_NEWER
9194
m_ListView.RefreshItems();
95+
#else
96+
m_ListView.Rebuild();
97+
#endif
9298
RenameNewActionMaps();
9399
}
94100

0 commit comments

Comments
 (0)