From 4c4e4bc45d2dea677f72f739f66f05403457243c Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Thu, 23 Jan 2025 17:00:37 +0800
Subject: [PATCH 01/19] marked area of concern with comment

---
 .../InputSystem/Editor/ControlPicker/InputControlPathEditor.cs  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index dbfc601023..cb747e70a3 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -179,6 +179,8 @@ private void ShowDropdown(Rect rect, SerializedProperty serializedProperty, Acti
 
             m_PickerDropdown.SetPickedCallback(path =>
             {
+                //At this point, the serialized property can sometines be referencing the old input actions asset
+                Debug.Log(serializedProperty.serializedObject.targetObject.GetInstanceID());
                 serializedProperty.stringValue = path;
                 m_PickerState.manualPathEditMode = false;
                 modifiedCallback();

From 9f69adf349bd6c56c22be7211fab68b501c61e93 Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Thu, 23 Jan 2025 17:33:55 +0800
Subject: [PATCH 02/19] WIP

---
 .../AssetEditor/InputBindingPropertiesView.cs |  8 +++-----
 .../ControlPicker/InputControlPathEditor.cs   | 20 +++++++++----------
 .../InputControlPickerDropdown.cs             |  1 +
 .../PropertyDrawers/InputControlPathDrawer.cs | 14 ++++++++++---
 .../UITKAssetEditor/Views/ActionsTreeView.cs  |  7 +++++++
 .../Views/BindingPropertiesView.cs            |  6 +++++-
 .../CompositePartBindingPropertiesView.cs     |  6 +++++-
 7 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
index 6e196023a4..c3138e684e 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
@@ -316,10 +316,7 @@ private void OnCompositeParametersModified()
             var nameAndParameters = NameAndParameters.Parse(path);
             nameAndParameters.parameters = m_CompositeParameters.GetParameters();
 
-            m_PathProperty.stringValue = nameAndParameters.ToString();
-            m_PathProperty.serializedObject.ApplyModifiedProperties();
-
-            OnPathChanged();
+            OnPathChanged(nameAndParameters.ToString());
         }
 
         private void OnBindingGroupsChanged()
@@ -330,8 +327,9 @@ private void OnBindingGroupsChanged()
             onChange?.Invoke(k_GroupsChanged);
         }
 
-        private void OnPathChanged()
+        private void OnPathChanged(string path)
         {
+            m_PathProperty.stringValue = path;
             m_BindingProperty.serializedObject.ApplyModifiedProperties();
             onChange?.Invoke(k_PathChanged);
         }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index cb747e70a3..7eac4480f4 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -26,7 +26,7 @@ public sealed class InputControlPathEditor : IDisposable
         /// <param name="onModified">Delegate that is called when the path has been modified.</param>
         /// <param name="label">Optional label to display instead of display name of <paramref name="pathProperty"/>.</param>
         /// <exception cref="ArgumentNullException"><paramref name="pathProperty"/> is <c>null</c>.</exception>
-        public InputControlPathEditor(SerializedProperty pathProperty, InputControlPickerState pickerState, Action onModified, GUIContent label = null)
+        public InputControlPathEditor(SerializedProperty pathProperty, InputControlPickerState pickerState, Action<string> onModified, GUIContent label = null)
         {
             if (pathProperty == null)
                 throw new ArgumentNullException(nameof(pathProperty));
@@ -89,7 +89,7 @@ public void OnGUI()
             EditorGUILayout.EndHorizontal();
         }
 
-        public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty property = null, Action modifiedCallback = null)
+        public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty property = null, Action<string> modifiedCallback = null)
         {
             var pathLabel = label ?? m_PathLabel;
             var serializedProperty = property ?? pathProperty;
@@ -141,7 +141,7 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert
                 {
                     serializedProperty.stringValue = path;
                     serializedProperty.serializedObject.ApplyModifiedProperties();
-                    (modifiedCallback ?? onModified).Invoke();
+                    (modifiedCallback ?? onModified).Invoke(path);
                 }
             }
             else
@@ -151,7 +151,7 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert
                 {
                     SetExpectedControlLayoutFromAttribute(serializedProperty);
                     ////TODO: for bindings that are part of composites, use the layout information from the [InputControl] attribute on the field
-                    ShowDropdown(bindingTextRect, serializedProperty, modifiedCallback ?? onModified);
+                    ShowDropdown(bindingTextRect, modifiedCallback ?? onModified);
                 }
             }
 
@@ -160,7 +160,7 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert
                 EditorStyles.miniButton);
         }
 
-        private void ShowDropdown(Rect rect, SerializedProperty serializedProperty, Action modifiedCallback)
+        private void ShowDropdown(Rect rect, Action<string> modifiedCallback)
         {
             #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
             InputActionsEditorSettingsProvider.SetIMGUIDropdownVisible(true, false);
@@ -171,19 +171,16 @@ private void ShowDropdown(Rect rect, SerializedProperty serializedProperty, Acti
                     m_PickerState,
                     path =>
                     {
-                        serializedProperty.stringValue = path;
                         m_PickerState.manualPathEditMode = false;
-                        modifiedCallback();
+                        modifiedCallback(path);
                     });
             }
 
             m_PickerDropdown.SetPickedCallback(path =>
             {
                 //At this point, the serialized property can sometines be referencing the old input actions asset
-                Debug.Log(serializedProperty.serializedObject.targetObject.GetInstanceID());
-                serializedProperty.stringValue = path;
                 m_PickerState.manualPathEditMode = false;
-                modifiedCallback();
+                modifiedCallback(path);
             });
 
             m_PickerDropdown.SetControlPathsToMatch(m_ControlPathsToMatch);
@@ -204,7 +201,7 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)
         }
 
         public SerializedProperty pathProperty { get; }
-        public Action onModified { get; }
+        public Action<string> onModified { get; }
 
         private GUIContent m_PathLabel;
         private string m_ExpectedControlLayout;
@@ -215,6 +212,7 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)
         private InputControlPickerDropdown m_PickerDropdown;
         private readonly InputControlPickerState m_PickerState;
         private InputActionRebindingExtensions.RebindingOperation m_RebindingOperation;
+
     }
 }
  #endif // UNITY_EDITOR
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs
index 6609f622f5..c6d3c794e5 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs
@@ -127,6 +127,7 @@ protected override void ItemSelected(AdvancedDropdownItem item)
             InputActionsEditorSettingsProvider.SetIMGUIDropdownVisible(false, true);
             #endif
             var path = ((InputControlDropdownItem)item).controlPathWithDevice;
+            Debug.Log("Picked: " + path);
             m_OnPickCallback(path);
         }
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
index 54e921840d..65d27b97c3 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
@@ -39,12 +39,20 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             if (m_Editor == null)
             {
                 m_Editor = new InputControlPathEditor(property, m_PickerState,
-                    () => property.serializedObject.ApplyModifiedProperties(),
+                    (path) =>
+                    {
+                        property.stringValue = path;
+                        property.serializedObject.ApplyModifiedProperties();
+                    },
                     label: label);
             }
-
+            
             EditorGUI.BeginProperty(position, label, property);
-            m_Editor.OnGUI(position, label, property, () => property.serializedObject.ApplyModifiedProperties());
+            m_Editor.OnGUI(position, label, property, (path) =>
+            {
+                property.stringValue = path;
+                property.serializedObject.ApplyModifiedProperties();
+            });
             EditorGUI.EndProperty();
         }
     }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index b85145747b..5be8919a97 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -32,6 +32,7 @@ internal class ActionsTreeView : ViewBase<ActionsTreeView.ViewState>
         public ActionsTreeView(VisualElement root, StateContainer stateContainer)
             : base(root, stateContainer)
         {
+            Debug.Log("Rebuilding TreeView");
             m_ActionMapsListView = root.Q<ListView>("action-maps-list-view");
             m_AddActionButton = root.Q<Button>("add-new-action-button");
             m_PropertiesScrollview = root.Q<ScrollView>("properties-scrollview");
@@ -106,6 +107,12 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
                 item.FocusOnRenameTextField();
             };
 
+            m_ActionsTreeView.selectionChanged += objects =>
+            {
+                var data = (ActionOrBindingData)objects.FirstOrDefault();
+                Debug.Log($"Selection Changed {data.actionIndex} . {data.bindingIndex}");
+            };
+
             m_ActionsTreeView.unbindItem = (element, i) =>
             {
                 var item = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(i);
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs
index f6fc24561b..8c7164f805 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs
@@ -59,7 +59,11 @@ public override void RedrawUI(ViewState viewState)
             else
             {
                 var controlPathEditor = new InputControlPathEditor(viewState.selectedBindingPath, new InputControlPickerState(),
-                    () => { Dispatch(Commands.ApplyModifiedProperties()); });
+                    (path) =>
+                    {
+                        viewState.selectedBindingPath.stringValue = path;
+                        Dispatch(Commands.ApplyModifiedProperties());
+                    });
                 controlPathEditor.SetControlPathsToMatch(viewState.currentControlScheme.deviceRequirements.Select(x => x.controlPath));
 
                 var inputAction = viewState.selectedInputAction;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs
index 014acce1f0..317fbd2de9 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs
@@ -36,7 +36,11 @@ public override void RedrawUI(ViewState viewState)
                 return;
             // TODO: Persist control picker state
             var controlPathEditor = new InputControlPathEditor(viewState.selectedBindingPath, new InputControlPickerState(),
-                () => { Dispatch(Commands.ApplyModifiedProperties()); });
+                (path) =>
+                {
+                    viewState.selectedBindingPath.stringValue = path;
+                    Dispatch(Commands.ApplyModifiedProperties());
+                });
 
             controlPathEditor.SetControlPathsToMatch(viewState.currentControlScheme.deviceRequirements.Select(x => x.controlPath));
             controlPathEditor.SetExpectedControlLayout(viewState.expectedControlLayoutName);

From e48476e283f2437f904b568e81a68967d7bb042a Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Wed, 29 Jan 2025 16:19:24 +0800
Subject: [PATCH 03/19] WIP

---
 .../Editor/UITKAssetEditor/InputActionsEditorWindow.cs     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs
index 2595192d24..b95b2c7bac 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs
@@ -282,7 +282,12 @@ private bool HasContentChanged()
         {
             var editedAsset = GetEditedAsset();
             var editedAssetJson = InputActionsEditorWindowUtils.ToJsonWithoutName(editedAsset);
-            return editedAssetJson != m_AssetJson;
+            var hasContentChanged = editedAssetJson != m_AssetJson;
+            if (hasContentChanged)
+            {
+                Debug.LogError("Content Changed");
+            }
+            return hasContentChanged;
         }
 
         private void DirtyInputActionsEditorWindow(InputActionsEditorState newState)

From f35d9f8d5558f4532797de140171d8dabbd56f89 Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Thu, 30 Jan 2025 12:22:49 +0800
Subject: [PATCH 04/19] revert changes

---
 .../AssetEditor/InputBindingPropertiesView.cs |  8 +++++---
 .../ControlPicker/InputControlPathEditor.cs   | 20 +++++++++----------
 .../InputControlPickerDropdown.cs             |  1 -
 .../PropertyDrawers/InputControlPathDrawer.cs | 14 +++----------
 .../InputActionsEditorWindow.cs               |  7 +------
 .../UITKAssetEditor/Views/ActionsTreeView.cs  |  7 -------
 .../Views/BindingPropertiesView.cs            |  6 +-----
 .../CompositePartBindingPropertiesView.cs     |  6 +-----
 8 files changed, 21 insertions(+), 48 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
index c3138e684e..6e196023a4 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
@@ -316,7 +316,10 @@ private void OnCompositeParametersModified()
             var nameAndParameters = NameAndParameters.Parse(path);
             nameAndParameters.parameters = m_CompositeParameters.GetParameters();
 
-            OnPathChanged(nameAndParameters.ToString());
+            m_PathProperty.stringValue = nameAndParameters.ToString();
+            m_PathProperty.serializedObject.ApplyModifiedProperties();
+
+            OnPathChanged();
         }
 
         private void OnBindingGroupsChanged()
@@ -327,9 +330,8 @@ private void OnBindingGroupsChanged()
             onChange?.Invoke(k_GroupsChanged);
         }
 
-        private void OnPathChanged(string path)
+        private void OnPathChanged()
         {
-            m_PathProperty.stringValue = path;
             m_BindingProperty.serializedObject.ApplyModifiedProperties();
             onChange?.Invoke(k_PathChanged);
         }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index 7eac4480f4..dbfc601023 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -26,7 +26,7 @@ public sealed class InputControlPathEditor : IDisposable
         /// <param name="onModified">Delegate that is called when the path has been modified.</param>
         /// <param name="label">Optional label to display instead of display name of <paramref name="pathProperty"/>.</param>
         /// <exception cref="ArgumentNullException"><paramref name="pathProperty"/> is <c>null</c>.</exception>
-        public InputControlPathEditor(SerializedProperty pathProperty, InputControlPickerState pickerState, Action<string> onModified, GUIContent label = null)
+        public InputControlPathEditor(SerializedProperty pathProperty, InputControlPickerState pickerState, Action onModified, GUIContent label = null)
         {
             if (pathProperty == null)
                 throw new ArgumentNullException(nameof(pathProperty));
@@ -89,7 +89,7 @@ public void OnGUI()
             EditorGUILayout.EndHorizontal();
         }
 
-        public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty property = null, Action<string> modifiedCallback = null)
+        public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty property = null, Action modifiedCallback = null)
         {
             var pathLabel = label ?? m_PathLabel;
             var serializedProperty = property ?? pathProperty;
@@ -141,7 +141,7 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert
                 {
                     serializedProperty.stringValue = path;
                     serializedProperty.serializedObject.ApplyModifiedProperties();
-                    (modifiedCallback ?? onModified).Invoke(path);
+                    (modifiedCallback ?? onModified).Invoke();
                 }
             }
             else
@@ -151,7 +151,7 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert
                 {
                     SetExpectedControlLayoutFromAttribute(serializedProperty);
                     ////TODO: for bindings that are part of composites, use the layout information from the [InputControl] attribute on the field
-                    ShowDropdown(bindingTextRect, modifiedCallback ?? onModified);
+                    ShowDropdown(bindingTextRect, serializedProperty, modifiedCallback ?? onModified);
                 }
             }
 
@@ -160,7 +160,7 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert
                 EditorStyles.miniButton);
         }
 
-        private void ShowDropdown(Rect rect, Action<string> modifiedCallback)
+        private void ShowDropdown(Rect rect, SerializedProperty serializedProperty, Action modifiedCallback)
         {
             #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
             InputActionsEditorSettingsProvider.SetIMGUIDropdownVisible(true, false);
@@ -171,16 +171,17 @@ private void ShowDropdown(Rect rect, Action<string> modifiedCallback)
                     m_PickerState,
                     path =>
                     {
+                        serializedProperty.stringValue = path;
                         m_PickerState.manualPathEditMode = false;
-                        modifiedCallback(path);
+                        modifiedCallback();
                     });
             }
 
             m_PickerDropdown.SetPickedCallback(path =>
             {
-                //At this point, the serialized property can sometines be referencing the old input actions asset
+                serializedProperty.stringValue = path;
                 m_PickerState.manualPathEditMode = false;
-                modifiedCallback(path);
+                modifiedCallback();
             });
 
             m_PickerDropdown.SetControlPathsToMatch(m_ControlPathsToMatch);
@@ -201,7 +202,7 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)
         }
 
         public SerializedProperty pathProperty { get; }
-        public Action<string> onModified { get; }
+        public Action onModified { get; }
 
         private GUIContent m_PathLabel;
         private string m_ExpectedControlLayout;
@@ -212,7 +213,6 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)
         private InputControlPickerDropdown m_PickerDropdown;
         private readonly InputControlPickerState m_PickerState;
         private InputActionRebindingExtensions.RebindingOperation m_RebindingOperation;
-
     }
 }
  #endif // UNITY_EDITOR
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs
index c6d3c794e5..6609f622f5 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs
@@ -127,7 +127,6 @@ protected override void ItemSelected(AdvancedDropdownItem item)
             InputActionsEditorSettingsProvider.SetIMGUIDropdownVisible(false, true);
             #endif
             var path = ((InputControlDropdownItem)item).controlPathWithDevice;
-            Debug.Log("Picked: " + path);
             m_OnPickCallback(path);
         }
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
index 65d27b97c3..54e921840d 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
@@ -39,20 +39,12 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             if (m_Editor == null)
             {
                 m_Editor = new InputControlPathEditor(property, m_PickerState,
-                    (path) =>
-                    {
-                        property.stringValue = path;
-                        property.serializedObject.ApplyModifiedProperties();
-                    },
+                    () => property.serializedObject.ApplyModifiedProperties(),
                     label: label);
             }
-            
+
             EditorGUI.BeginProperty(position, label, property);
-            m_Editor.OnGUI(position, label, property, (path) =>
-            {
-                property.stringValue = path;
-                property.serializedObject.ApplyModifiedProperties();
-            });
+            m_Editor.OnGUI(position, label, property, () => property.serializedObject.ApplyModifiedProperties());
             EditorGUI.EndProperty();
         }
     }
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs
index b95b2c7bac..2595192d24 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs
@@ -282,12 +282,7 @@ private bool HasContentChanged()
         {
             var editedAsset = GetEditedAsset();
             var editedAssetJson = InputActionsEditorWindowUtils.ToJsonWithoutName(editedAsset);
-            var hasContentChanged = editedAssetJson != m_AssetJson;
-            if (hasContentChanged)
-            {
-                Debug.LogError("Content Changed");
-            }
-            return hasContentChanged;
+            return editedAssetJson != m_AssetJson;
         }
 
         private void DirtyInputActionsEditorWindow(InputActionsEditorState newState)
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
index 5be8919a97..b85145747b 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/ActionsTreeView.cs
@@ -32,7 +32,6 @@ internal class ActionsTreeView : ViewBase<ActionsTreeView.ViewState>
         public ActionsTreeView(VisualElement root, StateContainer stateContainer)
             : base(root, stateContainer)
         {
-            Debug.Log("Rebuilding TreeView");
             m_ActionMapsListView = root.Q<ListView>("action-maps-list-view");
             m_AddActionButton = root.Q<Button>("add-new-action-button");
             m_PropertiesScrollview = root.Q<ScrollView>("properties-scrollview");
@@ -107,12 +106,6 @@ public ActionsTreeView(VisualElement root, StateContainer stateContainer)
                 item.FocusOnRenameTextField();
             };
 
-            m_ActionsTreeView.selectionChanged += objects =>
-            {
-                var data = (ActionOrBindingData)objects.FirstOrDefault();
-                Debug.Log($"Selection Changed {data.actionIndex} . {data.bindingIndex}");
-            };
-
             m_ActionsTreeView.unbindItem = (element, i) =>
             {
                 var item = m_ActionsTreeView.GetItemDataForIndex<ActionOrBindingData>(i);
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs
index 8c7164f805..f6fc24561b 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/BindingPropertiesView.cs
@@ -59,11 +59,7 @@ public override void RedrawUI(ViewState viewState)
             else
             {
                 var controlPathEditor = new InputControlPathEditor(viewState.selectedBindingPath, new InputControlPickerState(),
-                    (path) =>
-                    {
-                        viewState.selectedBindingPath.stringValue = path;
-                        Dispatch(Commands.ApplyModifiedProperties());
-                    });
+                    () => { Dispatch(Commands.ApplyModifiedProperties()); });
                 controlPathEditor.SetControlPathsToMatch(viewState.currentControlScheme.deviceRequirements.Select(x => x.controlPath));
 
                 var inputAction = viewState.selectedInputAction;
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs
index 317fbd2de9..014acce1f0 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Views/CompositePartBindingPropertiesView.cs
@@ -36,11 +36,7 @@ public override void RedrawUI(ViewState viewState)
                 return;
             // TODO: Persist control picker state
             var controlPathEditor = new InputControlPathEditor(viewState.selectedBindingPath, new InputControlPickerState(),
-                (path) =>
-                {
-                    viewState.selectedBindingPath.stringValue = path;
-                    Dispatch(Commands.ApplyModifiedProperties());
-                });
+                () => { Dispatch(Commands.ApplyModifiedProperties()); });
 
             controlPathEditor.SetControlPathsToMatch(viewState.currentControlScheme.deviceRequirements.Select(x => x.controlPath));
             controlPathEditor.SetExpectedControlLayout(viewState.expectedControlLayoutName);

From c2550974251fa8148cab731a6f3c0342767ebcdf Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Thu, 30 Jan 2025 12:23:04 +0800
Subject: [PATCH 05/19] remove unused code

---
 .../ControlPicker/InputControlPicker.cs       | 26 +------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs
index 2731ac7c05..63c9ad3036 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs
@@ -5,32 +5,8 @@
 
 namespace UnityEngine.InputSystem.Editor
 {
-    /// <summary>
-    /// A popup that allows picking input controls graphically.
-    /// </summary>
-    public sealed class InputControlPicker : IDisposable
+    public sealed class InputControlPicker
     {
-        public InputControlPicker(Mode mode, Action<string> onPick, InputControlPickerState state)
-        {
-            m_State = state ?? new InputControlPickerState();
-            m_Dropdown = new InputControlPickerDropdown(state, onPick, mode: mode);
-        }
-
-        public void Show(Rect rect)
-        {
-            m_Dropdown.Show(rect);
-        }
-
-        public void Dispose()
-        {
-            m_Dropdown?.Dispose();
-        }
-
-        public InputControlPickerState state => m_State;
-
-        private readonly InputControlPickerDropdown m_Dropdown;
-        private readonly InputControlPickerState m_State;
-
         public enum Mode
         {
             PickControl,

From 7e7e42187c3bde03b863b4267b56adaa5159b5b2 Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Thu, 30 Jan 2025 12:31:30 +0800
Subject: [PATCH 06/19] remove redundant code

---
 .../ControlPicker/InputControlPathEditor.cs    | 18 ------------------
 .../InputControlPickerDropdown.cs              |  5 -----
 2 files changed, 23 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index dbfc601023..79367d7c42 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -67,17 +67,6 @@ public void SetExpectedControlLayout(string expectedControlLayout)
             m_PickerDropdown?.SetExpectedControlLayout(m_ExpectedControlLayout);
         }
 
-        public void SetExpectedControlLayoutFromAttribute()
-        {
-            var field = pathProperty.GetField();
-            if (field == null)
-                return;
-
-            var attribute = field.GetCustomAttribute<InputControlAttribute>();
-            if (attribute != null)
-                SetExpectedControlLayout(attribute.layout);
-        }
-
         public void OnGUI()
         {
             EditorGUILayout.BeginHorizontal();
@@ -177,13 +166,6 @@ private void ShowDropdown(Rect rect, SerializedProperty serializedProperty, Acti
                     });
             }
 
-            m_PickerDropdown.SetPickedCallback(path =>
-            {
-                serializedProperty.stringValue = path;
-                m_PickerState.manualPathEditMode = false;
-                modifiedCallback();
-            });
-
             m_PickerDropdown.SetControlPathsToMatch(m_ControlPathsToMatch);
             m_PickerDropdown.SetExpectedControlLayout(m_ExpectedControlLayout);
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs
index 6609f622f5..f3887c7e4b 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPickerDropdown.cs
@@ -58,11 +58,6 @@ public void SetExpectedControlLayout(string expectedControlLayout)
             Reload();
         }
 
-        public void SetPickedCallback(Action<string> action)
-        {
-            m_OnPickCallback = action;
-        }
-
         protected override void OnDestroy()
         {
             #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS

From dbff69a5d7869fb91ca3ef5f0f7def6e0025f9ee Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Thu, 30 Jan 2025 12:50:10 +0800
Subject: [PATCH 07/19] remove redundant code

---
 .../ControlPicker/InputControlPathEditor.cs   | 20 +++++++++----------
 .../PropertyDrawers/InputControlPathDrawer.cs |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index 79367d7c42..1fcf3d3456 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -30,7 +30,7 @@ public InputControlPathEditor(SerializedProperty pathProperty, InputControlPicke
         {
             if (pathProperty == null)
                 throw new ArgumentNullException(nameof(pathProperty));
-
+            Debug.Log($"New Path Property on {pathProperty.serializedObject.targetObject.GetInstanceID()}");
             this.pathProperty = pathProperty;
             this.onModified = onModified;
             m_PickerState = pickerState ?? new InputControlPickerState();
@@ -78,10 +78,9 @@ public void OnGUI()
             EditorGUILayout.EndHorizontal();
         }
 
-        public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty property = null, Action modifiedCallback = null)
+        public void OnGUI(Rect rect, GUIContent label = null, Action modifiedCallback = null)
         {
             var pathLabel = label ?? m_PathLabel;
-            var serializedProperty = property ?? pathProperty;
 
             var lineRect = rect;
             var labelRect = lineRect;
@@ -103,7 +102,7 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert
             var path = String.Empty;
             try
             {
-                path = serializedProperty.stringValue;
+                path = pathProperty.stringValue;
             }
             catch
             {
@@ -128,8 +127,8 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert
                 path = EditorGUI.DelayedTextField(bindingTextRect, path);
                 if (EditorGUI.EndChangeCheck())
                 {
-                    serializedProperty.stringValue = path;
-                    serializedProperty.serializedObject.ApplyModifiedProperties();
+                    pathProperty.stringValue = path;
+                    pathProperty.serializedObject.ApplyModifiedProperties();
                     (modifiedCallback ?? onModified).Invoke();
                 }
             }
@@ -138,9 +137,9 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert
                 // Dropdown that shows binding text and allows opening control picker.
                 if (EditorGUI.DropdownButton(bindingTextRect, new GUIContent(displayName), FocusType.Keyboard))
                 {
-                    SetExpectedControlLayoutFromAttribute(serializedProperty);
+                    SetExpectedControlLayoutFromAttribute(pathProperty);
                     ////TODO: for bindings that are part of composites, use the layout information from the [InputControl] attribute on the field
-                    ShowDropdown(bindingTextRect, serializedProperty, modifiedCallback ?? onModified);
+                    ShowDropdown(bindingTextRect, modifiedCallback ?? onModified);
                 }
             }
 
@@ -149,7 +148,7 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert
                 EditorStyles.miniButton);
         }
 
-        private void ShowDropdown(Rect rect, SerializedProperty serializedProperty, Action modifiedCallback)
+        private void ShowDropdown(Rect rect, Action modifiedCallback)
         {
             #if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS
             InputActionsEditorSettingsProvider.SetIMGUIDropdownVisible(true, false);
@@ -160,7 +159,8 @@ private void ShowDropdown(Rect rect, SerializedProperty serializedProperty, Acti
                     m_PickerState,
                     path =>
                     {
-                        serializedProperty.stringValue = path;
+                        Debug.Log($"Saving path to property on {pathProperty.serializedObject.targetObject.GetInstanceID()}");
+                        pathProperty.stringValue = path;
                         m_PickerState.manualPathEditMode = false;
                         modifiedCallback();
                     });
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
index 54e921840d..2e57e15a91 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
@@ -44,7 +44,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             }
 
             EditorGUI.BeginProperty(position, label, property);
-            m_Editor.OnGUI(position, label, property, () => property.serializedObject.ApplyModifiedProperties());
+            m_Editor.OnGUI(position, label, () => property.serializedObject.ApplyModifiedProperties());
             EditorGUI.EndProperty();
         }
     }

From 9dc97d88248592a5fef7412b29f7233468fefaeb Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Thu, 30 Jan 2025 12:57:20 +0800
Subject: [PATCH 08/19] fix using static variable hack

---
 .../Editor/AssetEditor/InputBindingPropertiesView.cs  |  2 +-
 .../Editor/ControlPicker/InputControlPathEditor.cs    | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
index 6e196023a4..531a9e9f81 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
@@ -149,7 +149,7 @@ private static void DrawMatchingControlPaths(List<MatchingControlPath> matchingC
         private void DrawMatchingControlPaths()
         {
             bool controlPathUsagePresent = false;
-            List<MatchingControlPath> matchingControlPaths = MatchingControlPath.CollectMatchingControlPaths(m_ControlPathEditor.pathProperty.stringValue, showMatchingLayouts, ref controlPathUsagePresent);
+            List<MatchingControlPath> matchingControlPaths = MatchingControlPath.CollectMatchingControlPaths(InputControlPathEditor.pathProperty.stringValue, showMatchingLayouts, ref controlPathUsagePresent);
             if (matchingControlPaths == null || matchingControlPaths.Count != 0)
             {
                 EditorGUILayout.BeginVertical();
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index 1fcf3d3456..eb9f955101 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -31,7 +31,7 @@ public InputControlPathEditor(SerializedProperty pathProperty, InputControlPicke
             if (pathProperty == null)
                 throw new ArgumentNullException(nameof(pathProperty));
             Debug.Log($"New Path Property on {pathProperty.serializedObject.targetObject.GetInstanceID()}");
-            this.pathProperty = pathProperty;
+            InputControlPathEditor.pathProperty = pathProperty;
             this.onModified = onModified;
             m_PickerState = pickerState ?? new InputControlPickerState();
             m_PathLabel = label ?? new GUIContent(pathProperty.displayName, pathProperty.GetTooltip());
@@ -159,8 +159,8 @@ private void ShowDropdown(Rect rect, Action modifiedCallback)
                     m_PickerState,
                     path =>
                     {
-                        Debug.Log($"Saving path to property on {pathProperty.serializedObject.targetObject.GetInstanceID()}");
                         pathProperty.stringValue = path;
+                        pathProperty.serializedObject.ApplyModifiedProperties();
                         m_PickerState.manualPathEditMode = false;
                         modifiedCallback();
                     });
@@ -183,7 +183,12 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)
                 SetExpectedControlLayout(attribute.layout);
         }
 
-        public SerializedProperty pathProperty { get; }
+        // This static variable is a hack. Because the editor is rebuilt at unpredictable times with a new serializedObject, we need to keep updating
+        // This variable with most up to date serializedProperty, so that the picker dropdown can access the correct serializedProperty.
+        // The picker dropdown is a separate window and does not have access to the changed serializedObject reference.
+        // This is a temporary solution until the InputControlPathEditor is converted to UITK or there is away to have a stable, persistent serializedObject backing this editor.
+        // This property will be shared among multiple asset editor windows.
+        public static SerializedProperty pathProperty { get; private set; }
         public Action onModified { get; }
 
         private GUIContent m_PathLabel;

From bff9e60fd88f8711807351ed3acf8d506a7da618 Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Thu, 30 Jan 2025 13:00:44 +0800
Subject: [PATCH 09/19] remove debug log

---
 .../Editor/ControlPicker/InputControlPathEditor.cs            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index eb9f955101..8b70055543 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -30,7 +30,8 @@ public InputControlPathEditor(SerializedProperty pathProperty, InputControlPicke
         {
             if (pathProperty == null)
                 throw new ArgumentNullException(nameof(pathProperty));
-            Debug.Log($"New Path Property on {pathProperty.serializedObject.targetObject.GetInstanceID()}");
+            // Update the static pathProperty variable to the most recent serializedProperty. 
+            // See comment on pathProperty for more information.
             InputControlPathEditor.pathProperty = pathProperty;
             this.onModified = onModified;
             m_PickerState = pickerState ?? new InputControlPickerState();
@@ -185,6 +186,7 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)
 
         // This static variable is a hack. Because the editor is rebuilt at unpredictable times with a new serializedObject, we need to keep updating
         // This variable with most up to date serializedProperty, so that the picker dropdown can access the correct serializedProperty.
+        // This variable with most up to date serializedProperty, so that the picker dropdown can access the correct serializedProperty.
         // The picker dropdown is a separate window and does not have access to the changed serializedObject reference.
         // This is a temporary solution until the InputControlPathEditor is converted to UITK or there is away to have a stable, persistent serializedObject backing this editor.
         // This property will be shared among multiple asset editor windows.

From 5f55579858f05e41ba7942391df548934d6d837b Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Thu, 30 Jan 2025 13:09:17 +0800
Subject: [PATCH 10/19] Changelog entry

---
 Packages/com.unity.inputsystem/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
index a4f8d900e7..b3b965c7c5 100644
--- a/Packages/com.unity.inputsystem/CHANGELOG.md
+++ b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -17,6 +17,7 @@ however, it has to be formatted properly to pass verification tests.
 - Fixed an issue causing InvalidOperationException when entering playmode with domain reload disabled. [ISXB-1208](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1208).
 - Fixed an issue where compiling Addressables with Input System package present would result in failed compilation due to `IInputAnalytic.TryGatherData` not being defined [ISXB-1203](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1203).
 - Pinned Touch Samples sample package dependencies to avoid errors with Cinemachine 3.x and Probuilder 6.x. [ISXB-1245](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1245)
+- Fixed issue where a binding path is sometimes not saved when chosen from the binding path picker. [ISXB-1221](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1221)
 
 ## [1.12.0] - 2025-01-15
 

From 980d936fa391144c1ec0af0d2f8a43a11400f4fe Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Thu, 30 Jan 2025 13:15:19 +0800
Subject: [PATCH 11/19] format fix

---
 .../InputSystem/Editor/ControlPicker/InputControlPathEditor.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index 8b70055543..0171b14047 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -30,7 +30,7 @@ public InputControlPathEditor(SerializedProperty pathProperty, InputControlPicke
         {
             if (pathProperty == null)
                 throw new ArgumentNullException(nameof(pathProperty));
-            // Update the static pathProperty variable to the most recent serializedProperty. 
+            // Update the static pathProperty variable to the most recent serializedProperty.
             // See comment on pathProperty for more information.
             InputControlPathEditor.pathProperty = pathProperty;
             this.onModified = onModified;

From 1a206aeb4b57044dcdb5c278930b933fd3898282 Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Fri, 31 Jan 2025 07:39:16 +0800
Subject: [PATCH 12/19] fix API and adjust comments.

---
 .../AssetEditor/InputBindingPropertiesView.cs       |  2 +-
 .../Editor/ControlPicker/InputControlPathEditor.cs  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
index 531a9e9f81..6e196023a4 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/AssetEditor/InputBindingPropertiesView.cs
@@ -149,7 +149,7 @@ private static void DrawMatchingControlPaths(List<MatchingControlPath> matchingC
         private void DrawMatchingControlPaths()
         {
             bool controlPathUsagePresent = false;
-            List<MatchingControlPath> matchingControlPaths = MatchingControlPath.CollectMatchingControlPaths(InputControlPathEditor.pathProperty.stringValue, showMatchingLayouts, ref controlPathUsagePresent);
+            List<MatchingControlPath> matchingControlPaths = MatchingControlPath.CollectMatchingControlPaths(m_ControlPathEditor.pathProperty.stringValue, showMatchingLayouts, ref controlPathUsagePresent);
             if (matchingControlPaths == null || matchingControlPaths.Count != 0)
             {
                 EditorGUILayout.BeginVertical();
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index 9152e20652..41b176d0b1 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -32,7 +32,7 @@ public InputControlPathEditor(SerializedProperty pathProperty, InputControlPicke
                 throw new ArgumentNullException(nameof(pathProperty));
             // Update the static pathProperty variable to the most recent serializedProperty.
             // See comment on pathProperty for more information.
-            InputControlPathEditor.pathProperty = pathProperty;
+            s_pathProperty = pathProperty;
             this.onModified = onModified;
             m_PickerState = pickerState ?? new InputControlPickerState();
             m_PathLabel = label ?? new GUIContent(pathProperty.displayName, pathProperty.GetTooltip());
@@ -184,12 +184,15 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)
         }
 
         // This static variable is a hack. Because the editor is rebuilt at unpredictable times with a new serializedObject, we need to keep updating
-        // This variable with most up to date serializedProperty, so that the picker dropdown can access the correct serializedProperty.
-        // This variable with most up to date serializedProperty, so that the picker dropdown can access the correct serializedProperty.
+        // this variable with most up to date serializedProperty, so that the picker dropdown can access the correct serializedProperty.
         // The picker dropdown is a separate window and does not have access to the changed serializedObject reference.
-        // This is a temporary solution until the InputControlPathEditor is converted to UITK or there is away to have a stable, persistent serializedObject backing this editor.
+        // This could be removed if the InputControlPathEditor is converted to UITK with a stable, persistent serializedObject backing this editor.
         // This property will be shared among multiple asset editor windows.
-        public static SerializedProperty pathProperty { get; private set; }
+        private static SerializedProperty s_pathProperty { get; set; }
+        
+        // This property will always return the most recent serializedProperty.
+        public SerializedProperty pathProperty { get => s_pathProperty;}
+        
         public Action onModified { get; }
 
         private GUIContent m_PathLabel;

From 496fab1e033b0fcf6e5420b921f3af524b8c7bd6 Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Fri, 31 Jan 2025 09:06:17 +0800
Subject: [PATCH 13/19] format fix

---
 .../Editor/ControlPicker/InputControlPathEditor.cs            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index 41b176d0b1..a6fc742442 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -189,10 +189,10 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)
         // This could be removed if the InputControlPathEditor is converted to UITK with a stable, persistent serializedObject backing this editor.
         // This property will be shared among multiple asset editor windows.
         private static SerializedProperty s_pathProperty { get; set; }
-        
+
         // This property will always return the most recent serializedProperty.
         public SerializedProperty pathProperty { get => s_pathProperty;}
-        
+
         public Action onModified { get; }
 
         private GUIContent m_PathLabel;

From a2063c55ce207c775be4769ac0acf3f617fd26e7 Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Fri, 31 Jan 2025 13:04:03 +0800
Subject: [PATCH 14/19] restoring public api

---
 .../ControlPicker/InputControlPicker.cs       | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs
index 63c9ad3036..2731ac7c05 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPicker.cs
@@ -5,8 +5,32 @@
 
 namespace UnityEngine.InputSystem.Editor
 {
-    public sealed class InputControlPicker
+    /// <summary>
+    /// A popup that allows picking input controls graphically.
+    /// </summary>
+    public sealed class InputControlPicker : IDisposable
     {
+        public InputControlPicker(Mode mode, Action<string> onPick, InputControlPickerState state)
+        {
+            m_State = state ?? new InputControlPickerState();
+            m_Dropdown = new InputControlPickerDropdown(state, onPick, mode: mode);
+        }
+
+        public void Show(Rect rect)
+        {
+            m_Dropdown.Show(rect);
+        }
+
+        public void Dispose()
+        {
+            m_Dropdown?.Dispose();
+        }
+
+        public InputControlPickerState state => m_State;
+
+        private readonly InputControlPickerDropdown m_Dropdown;
+        private readonly InputControlPickerState m_State;
+
         public enum Mode
         {
             PickControl,

From 7a5cbe8b489e25d2721327b7fe4687b2124e87b6 Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Fri, 31 Jan 2025 14:22:18 +0800
Subject: [PATCH 15/19] restored more public api

---
 .../Editor/ControlPicker/InputControlPathEditor.cs    | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index a6fc742442..9e0a8f46b8 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -67,6 +67,17 @@ public void SetExpectedControlLayout(string expectedControlLayout)
             m_ExpectedControlLayout = expectedControlLayout;
             m_PickerDropdown?.SetExpectedControlLayout(m_ExpectedControlLayout);
         }
+        
+        public void SetExpectedControlLayoutFromAttribute()
+        {
+            var field = pathProperty.GetField();
+            if (field == null)
+                return;
+
+            var attribute = field.GetCustomAttribute<InputControlAttribute>();
+            if (attribute != null)
+                SetExpectedControlLayout(attribute.layout);
+        }
 
         public void OnGUI()
         {

From 1740639e7f76d2fadb11922ed2640747d53254f0 Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Fri, 31 Jan 2025 14:58:06 +0800
Subject: [PATCH 16/19] format fix

---
 .../InputSystem/Editor/ControlPicker/InputControlPathEditor.cs  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index 9e0a8f46b8..2b325a5ebf 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -67,7 +67,7 @@ public void SetExpectedControlLayout(string expectedControlLayout)
             m_ExpectedControlLayout = expectedControlLayout;
             m_PickerDropdown?.SetExpectedControlLayout(m_ExpectedControlLayout);
         }
-        
+
         public void SetExpectedControlLayoutFromAttribute()
         {
             var field = pathProperty.GetField();

From 373df1002303013e059d1f1dad7c4febb3b56fff Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Tue, 4 Feb 2025 16:02:56 +0800
Subject: [PATCH 17/19] restored even more API

---
 .../InputSystem/Editor/ControlPicker/InputControlPathEditor.cs | 3 ++-
 .../Editor/PropertyDrawers/InputControlPathDrawer.cs           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index 2b325a5ebf..a491018c3a 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -90,7 +90,8 @@ public void OnGUI()
             EditorGUILayout.EndHorizontal();
         }
 
-        public void OnGUI(Rect rect, GUIContent label = null, Action modifiedCallback = null)
+        //TODO: on next major version remove property argument.
+        public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty property = null, Action modifiedCallback = null)
         {
             var pathLabel = label ?? m_PathLabel;
 
diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
index 2e57e15a91..1176f527d8 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputControlPathDrawer.cs
@@ -44,7 +44,7 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             }
 
             EditorGUI.BeginProperty(position, label, property);
-            m_Editor.OnGUI(position, label, () => property.serializedObject.ApplyModifiedProperties());
+            m_Editor.OnGUI(position, label, property: null, modifiedCallback: () => property.serializedObject.ApplyModifiedProperties());
             EditorGUI.EndProperty();
         }
     }

From 9dab949ba4a727fc0c527036d6d83d888ab439ea Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Wed, 5 Feb 2025 09:25:11 +0800
Subject: [PATCH 18/19] cleanup dangling reference

---
 .../InputSystem/Editor/ControlPicker/InputControlPathEditor.cs   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
index a491018c3a..4ffc09886c 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Editor/ControlPicker/InputControlPathEditor.cs
@@ -40,6 +40,7 @@ public InputControlPathEditor(SerializedProperty pathProperty, InputControlPicke
 
         public void Dispose()
         {
+            s_pathProperty = null;
             m_PickerDropdown?.Dispose();
         }
 

From 90927738b88bad4197bed6e50a1b5bdc0cbac11d Mon Sep 17 00:00:00 2001
From: Simon Wittber <simonwittber@unity3d.com>
Date: Wed, 5 Feb 2025 10:21:58 +0800
Subject: [PATCH 19/19] Trigger Build