This was previously not working because the Paste command would only apply to the relevant Action Maps/Actions List/Tree, so if neither of those were focused, nothing would happen. We now also listen for Paste at the top level of the element hierarchy and send paste commands from there.

Notes

Issues:
• Undoing adding an Action Map/Action leaves the list unselected. Pasting at that point fails because the state thinks there's still a valid item selected. Mentionedhere, and should be added as a separate bug.
• Currently won't work if the window is tabbed to - user has to click somewhere in the window. Think I'll need to ask UITK team about this.

Checklist

Before review:

Changelog entry added.
- Explains the change inChanged,Fixed,Added sections.
- For API change contains an example snippet and/or migration example.
- FogBugz ticket attached, example([case %number%](https://issuetracker.unity3d.com/issues/...)).
- FogBugz is marked as "Resolved" withnext release version correctly set.
Tests added/changed, if applicable.
- Functional testsArea_CanDoX,Area_CanDoX_EvenIfYIsTheCase,Area_WhenIDoX_AndYHappens_ThisIsTheResult.
- Performance tests.
- Integration tests.
Docs for new/changed API's.
- Xmldoc cross references are set correctly.
- Added explanation how the API works.
- Usage code examples added.
- The manual is updated, if needed.

During merge:

Commit message for squash-merge is prefixed with one of the list:
- NEW: ___.
- FIX: ___.
- DOCS: ___.
- CHANGE: ___.
- RELEASE: 1.1.0-preview.3.

graham-huws force-pushed theISX-1823-cut-copy-between-windows branch from94d27e7 to8944d39Compare

February 15, 2024 00:46

FIX: Allow Copy/Paste between windows by intercepting the commands hi…

4d21dbf

…gher up the hierarchy. (ISX-1823)

graham-huws force-pushed theISX-1823-cut-copy-between-windows branch from8944d39 to4d21dbfCompare

February 15, 2024 11:41

graham-huws marked this pull request as ready for review

February 15, 2024 11:42

graham-huws requested review fromPauliusd01 andritamerkl

February 15, 2024 11:42

ekcoh reviewed

Feb 15, 2024

View reviewed changes

Packages/com.unity.inputsystem/CHANGELOG.md OutdatedShow resolvedHide resolved

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.cs Outdated

		{
		varpastePartOfComposite=IsPartOfComposite(json);
		if(index>0)
		if(index>0&&arrayProperty.arraySize>0&&index-1<arrayProperty.arraySize)

Copy link

Collaborator

ekcohFeb 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

I am confused about an index that must be greater than zero and at least two elements from the end of the anway? Would recommend adding an inline comment if this is correct but some kind of special case.

Copy link

CollaboratorAuthor

graham-huwsFeb 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

This somewhat doubled up from merging develop - should be clearer now :)

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.csShow resolvedHide resolved

Copy link

Collaborator

ekcoh commentedFeb 15, 2024

As a side-note, when#1834 lands there will exist an interesting scenario for this functionality when the same asset is open simultaneously in two windows, both in Project Settings and in a free-floating Input Action Editor.

ritamerkl reviewed

Feb 16, 2024

View reviewed changes

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CopyPasteHelper.csShow resolvedHide resolved

...ges/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/InputActionsEditorView.csShow resolvedHide resolved

Merge branch 'develop' into ISX-1823-cut-copy-between-windows

4e41f29

stefanunity requested review fromstefanunity and removed request forPauliusd01

February 19, 2024 10:07

graham-huwsand others added4 commits

February 20, 2024 11:18

Address feedback, and fix focusing when tabbing in to the window for …

9cda4d8

…events to work.

Catch errors, and simplify OnExecuteCommand.

108c268

Merge branch 'develop' into ISX-1823-cut-copy-between-windows

5b5e663

Avoid array OOB.

384cb74

stefanunity approved these changes

Feb 21, 2024

View reviewed changes

Copy link

Collaborator

stefanunity left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

Finished for now. Two bugs not yet fixed are:

BUG: trying to paste an action into empty map throws error:
--ArgumentException: '0' cannot be greater than -1.
BUG: trying to paste a modifier into empty map throws errror
--NullReferenceException: Object reference not set to an instance of an object

Once they are fixed it looks good.

graham-huws added2 commits

February 21, 2024 15:58

Deduplicate Paste handling.

b7617fe

Fix SelectBinding not doing so, and simplify Paste handling.

2e64bb2

ritamerkl requested a review fromPauliusd01

February 22, 2024 11:45

graham-huwsand others added3 commits

February 22, 2024 12:01

Fix array index bounds. Clamp doesn't work if arraySize is 0.

7ae236a

Catch issue with pasting a binding into an empty map.

a5e7de0

Merge branch 'develop' into ISX-1823-cut-copy-between-windows

9a9cf85

Copy link

CollaboratorAuthor

graham-huws commentedFeb 22, 2024

Finished for now. Two bugs not yet fixed are:

1. BUG: trying to paste an action into empty map throws error:   --ArgumentException: '0' cannot be greater than -1.2. BUG: trying to paste a  modifier into empty map throws errror   --NullReferenceException: Object reference not set to an instance of an object

Once they are fixed it looks good.

Thanks@stefanunity - I believe these should both be fixed now, can you confirm?

Copy link

Collaborator

Pauliusd01 commentedFeb 22, 2024•
edited
Loading

Unity_2024-02-22_14-11-34.mp4

Cutting and pasting into an empty asset somehow "resurrects" all of the previously deleted actions. (I do deselect ProjectWideActions to confirm the auto save but that does not seem to help)