Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 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
1 change: 1 addition & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ however, it has to be formatted properly to pass verification tests.
- Fixed multiple `OnScreenStick` Components that does not work together when using them simultaneously in isolation mode. [ISXB-813](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-813)
- Fixed an issue in input actions editor window that caused certain fields in custom input composite bindings to require multiple clicks to action / focus. [ISXB-1171](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1171)
- Fixed an editor/player hang in `InputSystemUIInputModule` due to an infinite loop. This was caused by the assumption that `RemovePointerAtIndex` would _always_ successfully remove the pointer, which is not the case with touch based pointers. [ISXB-1258](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1258)
- Fixed Cut Mode for Action Maps and Actions to make renaming disabled. [ISXB-1155](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1155)

### Changed
- Changed location of the link xml file (code stripping rules), from a temporary directory to the project Library folder (ISX-2140).
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