Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ however, it has to be formatted properly to pass verification tests.

## [Unreleased] - yyyy-mm-dd

### Fixed
- Fixed Cut Mode for Action Maps and Actions to make renaming disabled. [ISXB-1155](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1155)

## [1.12.0] - 2025-01-15

### Fixed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public ActionMapsView(VisualElement root, StateContainer stateContainer)
treeViewItem.EditTextFinished += treeViewItem.EditTextFinishedCallback;
treeViewItem.userData = i;
element.SetEnabled(!mapData.isDisabled);
treeViewItem.isDisabledActionMap = mapData.isDisabled;

ContextMenu.GetContextMenuForActionMapItem(this, treeViewItem, i);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
EditorInputControlLayoutCache.GetIconForLayout("Control"));

e.SetEnabled(!item.isCut);
treeViewItem.isCut = item.isCut;
};

m_ActionsTreeView.itemsChosen += objects =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ internal class InputActionMapsTreeViewItem : VisualElement
private bool m_IsEditing;
private static InputActionMapsTreeViewItem s_EditingItem = null;

internal bool isDisabledActionMap { get; set; }

public InputActionMapsTreeViewItem()
{
var template = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
Expand Down Expand Up @@ -98,7 +100,7 @@ public void Reset()

public void FocusOnRenameTextField()
{
if (m_IsEditing)
if (m_IsEditing || isDisabledActionMap)
return;
delegatesFocus = true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ internal class InputActionsTreeViewItem : VisualElement
private bool m_IsEditing;
private static InputActionsTreeViewItem s_EditingItem = null;

internal bool isCut { get; set; }

public InputActionsTreeViewItem()
{
var template = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
Expand All @@ -42,7 +44,6 @@ public InputActionsTreeViewItem()
public Label label => this.Q<Label>();
private TextField renameTextfield => this.Q<TextField>(kRenameTextField);


public void UnregisterInputField()
{
renameTextfield.SetEnabled(false);
Expand Down Expand Up @@ -77,7 +78,7 @@ public void Reset()

public void FocusOnRenameTextField()
{
if (m_IsEditing)
if (m_IsEditing || isCut)
return;
delegatesFocus = true;

Expand Down
Loading