Skip to content

Commit 134c3b4

Browse files
authored
FIX: Mark Action Maps and Actions as disabled for renaming when in cut mode (#2088)
1 parent 2b6d8c8 commit 134c3b4

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

Packages/com.unity.inputsystem/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ however, it has to be formatted properly to pass verification tests.
1010

1111
## [Unreleased] - yyyy-mm-dd
1212

13+
### Fixed
14+
- Fixed Cut Mode for Action Maps and Actions to make renaming disabled. [ISXB-1155](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1155)
15+
1316
## [1.12.0] - 2025-01-15
1417

1518
### Fixed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
3232
treeViewItem.EditTextFinished += treeViewItem.EditTextFinishedCallback;
3333
treeViewItem.userData = i;
3434
element.SetEnabled(!mapData.isDisabled);
35+
treeViewItem.isDisabledActionMap = mapData.isDisabled;
3536

3637
ContextMenu.GetContextMenuForActionMapItem(this, treeViewItem, i);
3738
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
9494
EditorInputControlLayoutCache.GetIconForLayout("Control"));
9595

9696
e.SetEnabled(!item.isCut);
97+
treeViewItem.isCut = item.isCut;
9798
};
9899

99100
m_ActionsTreeView.itemsChosen += objects =>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ internal class InputActionMapsTreeViewItem : VisualElement
2626
private bool m_IsEditing;
2727
private static InputActionMapsTreeViewItem s_EditingItem = null;
2828

29+
internal bool isDisabledActionMap { get; set; }
30+
2931
public InputActionMapsTreeViewItem()
3032
{
3133
var template = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
@@ -98,7 +100,7 @@ public void Reset()
98100

99101
public void FocusOnRenameTextField()
100102
{
101-
if (m_IsEditing)
103+
if (m_IsEditing || isDisabledActionMap)
102104
return;
103105
delegatesFocus = true;
104106

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ internal class InputActionsTreeViewItem : VisualElement
2020
private bool m_IsEditing;
2121
private static InputActionsTreeViewItem s_EditingItem = null;
2222

23+
internal bool isCut { get; set; }
24+
2325
public InputActionsTreeViewItem()
2426
{
2527
var template = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
@@ -42,7 +44,6 @@ public InputActionsTreeViewItem()
4244
public Label label => this.Q<Label>();
4345
private TextField renameTextfield => this.Q<TextField>(kRenameTextField);
4446

45-
4647
public void UnregisterInputField()
4748
{
4849
renameTextfield.SetEnabled(false);
@@ -77,7 +78,7 @@ public void Reset()
7778

7879
public void FocusOnRenameTextField()
7980
{
80-
if (m_IsEditing)
81+
if (m_IsEditing || isCut)
8182
return;
8283
delegatesFocus = true;
8384

0 commit comments

Comments
 (0)