NEW: edit actions and bindings properties (ISX-1374, ISX-1126)

Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/ParameterListView.cs

@@ -263,6 +263,10 @@ void OnValueChanged(ref EditableParameterValue parameter, object result, int i)
             {
                 parameter.value.value = PrimitiveValue.FromObject(result).ConvertTo(parameter.value.type);
                 m_Parameters[i] = parameter;
+            }
+
+            void OnEditEnd()
+            {
                 onChange?.Invoke();
             }
 
@@ -277,41 +281,47 @@ void OnValueChanged(ref EditableParameterValue parameter, object result, int i)
                     var intValue = parameter.value.value.ToInt32();
                     var field = new DropdownField(label.text, parameter.enumNames.Select(x => x.text).ToList(), intValue);
                     field.RegisterValueChangedCallback(evt => OnValueChanged(ref parameter, evt.newValue, closedIndex));
+                    field.RegisterCallback<BlurEvent>(_ => OnEditEnd());
                     root.Add(field);
                 }
                 else if (parameter.value.type == TypeCode.Int64 || parameter.value.type == TypeCode.UInt64)
                 {
                     var longValue = parameter.value.value.ToInt64();
                     var field = new LongField(label.text) { value = longValue };
                     field.RegisterValueChangedCallback(evt => OnValueChanged(ref parameter, evt.newValue, closedIndex));
+                    field.RegisterCallback<BlurEvent>(_ => OnEditEnd());
                     root.Add(field);
                 }
                 else if (parameter.value.type.IsInt())
                 {
                     var intValue = parameter.value.value.ToInt32();
                     var field = new IntegerField(label.text) { value = intValue };
                     field.RegisterValueChangedCallback(evt => OnValueChanged(ref parameter, evt.newValue, closedIndex));
+                    field.RegisterCallback<BlurEvent>(_ => OnEditEnd());
                     root.Add(field);
                 }
                 else if (parameter.value.type == TypeCode.Single)
                 {
                     var floatValue = parameter.value.value.ToSingle();
                     var field = new FloatField(label.text) { value = floatValue };
                     field.RegisterValueChangedCallback(evt => OnValueChanged(ref parameter, evt.newValue, closedIndex));
+                    field.RegisterCallback<BlurEvent>(_ => OnEditEnd());
                     root.Add(field);
                 }
                 else if (parameter.value.type == TypeCode.Double)
                 {
                     var floatValue = parameter.value.value.ToDouble();
                     var field = new DoubleField(label.text) { value = floatValue };
                     field.RegisterValueChangedCallback(evt => OnValueChanged(ref parameter, evt.newValue, closedIndex));
+                    field.RegisterCallback<BlurEvent>(_ => OnEditEnd());
                     root.Add(field);
                 }
                 else if (parameter.value.type == TypeCode.Boolean)
                 {
                     var boolValue = parameter.value.value.ToBoolean();
                     var field = new Toggle(label.text) { value = boolValue };
                     field.RegisterValueChangedCallback(evt => OnValueChanged(ref parameter, evt.newValue, closedIndex));
+                    field.RegisterCallback<BlurEvent>(_ => OnEditEnd());
                     root.Add(field);
                 }
             }

Packages/com.unity.inputsystem/InputSystem/Editor/InputParameterEditor.cs

@@ -232,12 +232,13 @@ public void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
 
                 m_FloatField = new FloatField(m_ValueLabel.text) { value = value };
                 m_FloatField.RegisterValueChangedCallback(ChangeSettingValue);
+                m_FloatField.RegisterCallback<BlurEvent>(_ => OnEditEnd(onChangedCallback));
                 m_FloatField.SetEnabled(!m_UseDefaultValue);
 
                 m_HelpBox = new HelpBox(m_HelpBoxText.text, HelpBoxMessageType.None);
 
                 m_DefaultToggle = new Toggle("Default") { value = m_UseDefaultValue };
-                m_DefaultToggle.RegisterValueChangedCallback(ToggleUseDefaultValue);
+                m_DefaultToggle.RegisterValueChangedCallback(evt => ToggleUseDefaultValue(evt, onChangedCallback));
 
 
                 var buttonContainer = new VisualElement
@@ -249,12 +250,17 @@ public void OnDrawVisualElements(VisualElement root, Action onChangedCallback)
                 };
                 m_OpenInputSettingsButton = new Button(InputSettingsProvider.Open){text = m_OpenInputSettingsLabel.text};
                 m_OpenInputSettingsButton.AddToClassList("open-settings-button");
-                buttonContainer.Add(m_OpenInputSettingsButton);
 
                 settingsContainer.Add(m_FloatField);
                 settingsContainer.Add(m_DefaultToggle);
                 container.Add(settingsContainer);
-                container.Add(m_HelpBox);
+
+                if (m_UseDefaultValue)
+                {
+                    buttonContainer.Add(m_OpenInputSettingsButton);
+                    container.Add(m_HelpBox);
+                }
+
                 container.Add(buttonContainer);
 
                 root.Add(container);
@@ -278,18 +284,21 @@ private void ChangeSettingValue(ChangeEvent<float> evt)
                 }
             }
 
-            private void ToggleUseDefaultValue(ChangeEvent<bool> evt)
+            private void OnEditEnd(Action onChangedCallback)
+            {
+                onChangedCallback.Invoke();
+            }
+
+            private void ToggleUseDefaultValue(ChangeEvent<bool> evt, Action onChangedCallback)
             {
                 if (evt.newValue != m_UseDefaultValue)
                 {
                     m_SetValue(!evt.newValue ? m_GetDefaultValue() : m_DefaultInitializedValue);
+                    onChangedCallback.Invoke();
                 }
 
                 m_UseDefaultValue = evt.newValue;
-
                 m_FloatField?.SetEnabled(!m_UseDefaultValue);
-                m_HelpBox.visible = m_UseDefaultValue;
-                m_OpenInputSettingsButton.visible = m_UseDefaultValue;
             }
 
 #endif

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/InputActionsEditorStyles.uss

@@ -29,7 +29,7 @@
     border-width: 0;
 }
 
-#add-new-action-button {
+#add-new-action-button  {
     background-color: transparent;
     border-width: 0;
 }
@@ -40,6 +40,14 @@
     margin-left: 0;
 }
 
+.add-interaction-processor-button {
+    padding-top: 0;
+    font-size: 12;
+    border-width: 0;
+    background-color: transparent;
+    margin-right: 5;
+}
+
 .header-label {
     font-size: 19px;
     margin-left: 7px;
@@ -136,13 +144,24 @@
     background-image: resource('Packages/com.unity.inputsystem/InputSystem/Editor/Icons/ChevronUp.png');
 }
 
+.name-and-parameters-list-view .upDarkTheme {
+    background-image: resource('Packages/com.unity.inputsystem/InputSystem/Editor/Icons/d_ChevronUp.png');
+}
+
 .name-and-parameters-list-view .down {
     background-image: resource('Packages/com.unity.inputsystem/InputSystem/Editor/Icons/ChevronDown.png');
 }
 
+.name-and-parameters-list-view .downDarkTheme {
+    background-image: resource('Packages/com.unity.inputsystem/InputSystem/Editor/Icons/d_ChevronDown.png');
+}
+
 .name-and-parameters-list-view .delete {
     background-image: resource('Toolbar Minus.png');
 }
+.name-and-parameters-list-view .deleteDarkTheme {
+    background-image: resource('d_Toolbar Minus.png');
+}
 
 .search-field {
     width: 190px;

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

@@ -1,4 +1,5 @@
 #if UNITY_EDITOR && UNITY_INPUT_SYSTEM_UI_TK_ASSET_EDITOR
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEditor;
@@ -51,6 +52,8 @@ public override void RedrawUI((SerializedInputAction ? , List<string>) viewState
                 controlType.choices.Clear();
                 controlType.choices.AddRange(controlTypes.Select(ObjectNames.NicifyVariableName).ToList());
                 var controlTypeIndex = controlTypes.FindIndex(s => s == inputAction.expectedControlType);
+                //if type changed and index is -1 clamp to 0, prevent overflowing indices
+                controlTypeIndex = Math.Clamp(controlTypeIndex, 0, controlTypes.Count - 1);
                 controlType.SetValueWithoutNotify(controlType.choices[controlTypeIndex]);
                 controlType.tooltip = inputAction.expectedControlTypeTooltip;
 
@@ -67,6 +70,7 @@ public override void RedrawUI((SerializedInputAction ? , List<string>) viewState
                 {
                     tooltip = InputActionsEditorConstants.InitialStateCheckTooltip
                 };
+                initialStateCheck.SetValueWithoutNotify(inputAction.initialStateCheck);
                 initialStateCheck.RegisterValueChangedCallback(evt =>
                 {
                     Dispatch(Commands.ChangeInitialStateCheck(inputAction, evt.newValue));

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

@@ -29,11 +29,13 @@ public CompositePartBindingPropertiesView(VisualElement root, StateContainer sta
             m_CompositePartField = container.Q<DropdownField>("composite-part-dropdown");
 
             CreateSelector(Selectors.GetSelectedBinding,
-                (b, s) => !b.HasValue ? null : Selectors.GetCompositePartBindingViewState(b.Value, s));
+                (b, s) => b.HasValue && b.Value.isPartOfComposite ? Selectors.GetCompositePartBindingViewState(b.Value, s) : null);
         }
 
         public override void RedrawUI(ViewState viewState)
         {
+            if (viewState == null)
+                return;
             // TODO: Persist control picker state
             var controlPathEditor = new InputControlPathEditor(viewState.selectedBindingPath, new InputControlPickerState(),
                 () => { Dispatch(Commands.ApplyModifiedProperties()); });

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

@@ -4,6 +4,7 @@
 using System.Linq;
 using UnityEditor;
 using UnityEngine.InputSystem.Editor.Lists;
+using UnityEngine.InputSystem.Utilities;
 using UnityEngine.UIElements;
 
 namespace UnityEngine.InputSystem.Editor
@@ -14,16 +15,81 @@ internal class NameAndParametersListView : ViewBase<InputActionsEditorState>
         private readonly Func<InputActionsEditorState, IEnumerable<ParameterListView>> m_ParameterListViewSelector;
         private VisualElement m_ContentContainer;
 
-        public NameAndParametersListView(VisualElement root, StateContainer stateContainer,
+        private SerializedProperty m_ListProperty;
+
+        public NameAndParametersListView(VisualElement root, StateContainer stateContainer, SerializedProperty listProperty,
                                          Func<InputActionsEditorState, IEnumerable<ParameterListView>> parameterListViewSelector)
             : base(stateContainer)
         {
             m_Root = root;
+            m_ListProperty = listProperty;
             m_ParameterListViewSelector = parameterListViewSelector;
 
             CreateSelector(state => state);
         }
 
+        public void OnAddElement(string name)
+        {
+            if (m_ListProperty == null)
+                return;
+
+            var interactionsOrProcessorsList = NameAndParameters.ParseMultiple(m_ListProperty.stringValue).ToList();
+            var newElement = new NameAndParameters() { name = name};
+            interactionsOrProcessorsList.Add(newElement);
+
+            m_ListProperty.stringValue = ToSerializableString(interactionsOrProcessorsList);
+            m_ListProperty.serializedObject.ApplyModifiedProperties();
+        }
+
+        private void MoveElementUp(int index)
+        {
+            var newIndex = index - 1;
+            SwapElement(index, newIndex);
+        }
+
+        private void MoveElementDown(int index)
+        {
+            var newIndex = index + 1;
+            SwapElement(index, newIndex);
+        }
+
+        private void SwapElement(int oldIndex, int newIndex)
+        {
+            var interactionsOrProcessors = NameAndParameters.ParseMultiple(m_ListProperty.stringValue).ToArray();
+            var oldIndexIsValid = oldIndex >= 0 && oldIndex < interactionsOrProcessors.Length;
+            var newIndexIsValid = newIndex >= 0 && newIndex < interactionsOrProcessors.Length;
+            if (interactionsOrProcessors.Length == 0 || !newIndexIsValid || !oldIndexIsValid)
+                return;
+            MemoryHelpers.Swap(ref interactionsOrProcessors[oldIndex], ref interactionsOrProcessors[newIndex]);
+            m_ListProperty.stringValue = ToSerializableString(interactionsOrProcessors);
+            m_ListProperty.serializedObject.ApplyModifiedProperties();
+        }
+
+        private void DeleteElement(int index)
+        {
+            var interactionsOrProcessorsList = NameAndParameters.ParseMultiple(m_ListProperty.stringValue).ToList();
+            interactionsOrProcessorsList.RemoveAt(index);
+            m_ListProperty.stringValue = ToSerializableString(interactionsOrProcessorsList);
+            m_ListProperty.serializedObject.ApplyModifiedProperties();
+        }
+
+        private void OnParametersChanged(ParameterListView listView, int index)
+        {
+            var interactionsOrProcessorsList = NameAndParameters.ParseMultiple(m_ListProperty.stringValue).ToList();
+            interactionsOrProcessorsList[index] = new NameAndParameters { name = interactionsOrProcessorsList[index].name, parameters = listView.GetParameters() };
+            m_ListProperty.stringValue = ToSerializableString(interactionsOrProcessorsList);
+            m_ListProperty.serializedObject.ApplyModifiedProperties();
+        }
+
+        private static string ToSerializableString(IEnumerable<NameAndParameters> parametersForEachListItem)
+        {
+            if (parametersForEachListItem == null)
+                return string.Empty;
+
+            return string.Join(NamedValue.Separator,
+                parametersForEachListItem.Select(x => x.ToString()).ToArray());
+        }
+
         public override void RedrawUI(InputActionsEditorState state)
         {
             if (m_ContentContainer != null)
@@ -41,9 +107,19 @@ public override void RedrawUI(InputActionsEditorState state)
 
             m_Root.Q<Label>("no-parameters-added-label").style.display = new StyleEnum<DisplayStyle>(DisplayStyle.None);
             m_ContentContainer.Clear();
-            foreach (var parameterListView in parameterListViews)
+            for (int i = 0; i < parameterListViews.Count; i++)
             {
-                new NameAndParametersListViewItem(m_ContentContainer, parameterListView);
+                var index = i;
+                var buttonProperties = new ButtonProperties()
+                {
+                    onClickDown = () => MoveElementDown(index),
+                    onClickUp = () => MoveElementUp(index),
+                    onDelete = () => DeleteElement(index),
+                    isDownButtonActive = index < parameterListViews.Count - 1,
+                    isUpButtonActive = index > 0
+                };
+                new NameAndParametersListViewItem(m_ContentContainer, parameterListViews[i], buttonProperties);
+                parameterListViews[i].onChange += () => OnParametersChanged(parameterListViews[index], index);
             }
         }
 
@@ -57,9 +133,18 @@ public override void DestroyView()
         }
     }
 
+    internal struct ButtonProperties
+    {
+        public Action onClickUp;
+        public Action onClickDown;
+        public Action onDelete;
+        public bool isUpButtonActive;
+        public bool isDownButtonActive;
+    }
+
     internal class NameAndParametersListViewItem
     {
-        public NameAndParametersListViewItem(VisualElement root, ParameterListView parameterListView)
+        public NameAndParametersListViewItem(VisualElement root, ParameterListView parameterListView, ButtonProperties buttonProperties)
         {
             var itemTemplate = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
                 InputActionsEditorConstants.PackagePath +
@@ -72,16 +157,21 @@ public NameAndParametersListViewItem(VisualElement root, ParameterListView param
             var header = container.Q<Toggle>();
 
             var moveItemUpButton = new Button();
-            moveItemUpButton.AddToClassList("up");
+            moveItemUpButton.AddToClassList(EditorGUIUtility.isProSkin ? "upDarkTheme" : "up");
             moveItemUpButton.AddToClassList("name-and-parameters-list-foldout-button");
+            moveItemUpButton.SetEnabled(buttonProperties.isUpButtonActive);
+            moveItemUpButton.clicked += buttonProperties.onClickUp;
 
             var moveItemDownButton = new Button();
-            moveItemDownButton.AddToClassList("down");
+            moveItemDownButton.AddToClassList(EditorGUIUtility.isProSkin ? "downDarkTheme" : "down");
             moveItemDownButton.AddToClassList("name-and-parameters-list-foldout-button");
+            moveItemDownButton.SetEnabled(buttonProperties.isDownButtonActive);
+            moveItemDownButton.clicked += buttonProperties.onClickDown;
 
             var deleteItemButton = new Button();
-            deleteItemButton.AddToClassList("delete");
+            deleteItemButton.AddToClassList(EditorGUIUtility.isProSkin ? "deleteDarkTheme" : "delete");
             deleteItemButton.AddToClassList("name-and-parameters-list-foldout-button");
+            deleteItemButton.clicked += buttonProperties.onDelete;
 
             header.Add(moveItemUpButton);
             header.Add(moveItemDownButton);