WIP

smnwttbr · smnwttbr · commit 9f69adf349bd · 2025-01-30T11:16:44.000+08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -316,10 +316,7 @@ private void OnCompositeParametersModified()`
`316`	`316`	`var nameAndParameters = NameAndParameters.Parse(path);`
`317`	`317`	`nameAndParameters.parameters = m_CompositeParameters.GetParameters();`
`318`	`318`
`319`		`- m_PathProperty.stringValue = nameAndParameters.ToString();`
`320`		`- m_PathProperty.serializedObject.ApplyModifiedProperties();`
`321`		`-`
`322`		`- OnPathChanged();`
	`319`	`+ OnPathChanged(nameAndParameters.ToString());`
`323`	`320`	`}`
`324`	`321`
`325`	`322`	`private void OnBindingGroupsChanged()`
`@@ -330,8 +327,9 @@ private void OnBindingGroupsChanged()`
`330`	`327`	`onChange?.Invoke(k_GroupsChanged);`
`331`	`328`	`}`
`332`	`329`
`333`		`- private void OnPathChanged()`
	`330`	`+ private void OnPathChanged(string path)`
`334`	`331`	`{`
	`332`	`+ m_PathProperty.stringValue = path;`
`335`	`333`	`m_BindingProperty.serializedObject.ApplyModifiedProperties();`
`336`	`334`	`onChange?.Invoke(k_PathChanged);`
`337`	`335`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public sealed class InputControlPathEditor : IDisposable`
`26`	`26`	`/// <param name="onModified">Delegate that is called when the path has been modified.</param>`
`27`	`27`	`/// <param name="label">Optional label to display instead of display name of <paramref name="pathProperty"/>.</param>`
`28`	`28`	`/// <exception cref="ArgumentNullException"><paramref name="pathProperty"/> is <c>null</c>.</exception>`
`29`		`- public InputControlPathEditor(SerializedProperty pathProperty, InputControlPickerState pickerState, Action onModified, GUIContent label = null)`
	`29`	`+ public InputControlPathEditor(SerializedProperty pathProperty, InputControlPickerState pickerState, Action<string> onModified, GUIContent label = null)`
`30`	`30`	`{`
`31`	`31`	`if (pathProperty == null)`
`32`	`32`	`throw new ArgumentNullException(nameof(pathProperty));`
`@@ -89,7 +89,7 @@ public void OnGUI()`
`89`	`89`	`EditorGUILayout.EndHorizontal();`
`90`	`90`	`}`
`91`	`91`
`92`		`- public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty property = null, Action modifiedCallback = null)`
	`92`	`+ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty property = null, Action<string> modifiedCallback = null)`
`93`	`93`	`{`
`94`	`94`	`var pathLabel = label ?? m_PathLabel;`
`95`	`95`	`var serializedProperty = property ?? pathProperty;`
`@@ -141,7 +141,7 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert`
`141`	`141`	`{`
`142`	`142`	`serializedProperty.stringValue = path;`
`143`	`143`	`serializedProperty.serializedObject.ApplyModifiedProperties();`
`144`		`- (modifiedCallback ?? onModified).Invoke();`
	`144`	`+ (modifiedCallback ?? onModified).Invoke(path);`
`145`	`145`	`}`
`146`	`146`	`}`
`147`	`147`	`else`
`@@ -151,7 +151,7 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert`
`151`	`151`	`{`
`152`	`152`	`SetExpectedControlLayoutFromAttribute(serializedProperty);`
`153`	`153`	`////TODO: for bindings that are part of composites, use the layout information from the [InputControl] attribute on the field`
`154`		`- ShowDropdown(bindingTextRect, serializedProperty, modifiedCallback ?? onModified);`
	`154`	`+ ShowDropdown(bindingTextRect, modifiedCallback ?? onModified);`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`@@ -160,7 +160,7 @@ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty propert`
`160`	`160`	`EditorStyles.miniButton);`
`161`	`161`	`}`
`162`	`162`
`163`		`- private void ShowDropdown(Rect rect, SerializedProperty serializedProperty, Action modifiedCallback)`
	`163`	`+ private void ShowDropdown(Rect rect, Action<string> modifiedCallback)`
`164`	`164`	`{`
`165`	`165`	`#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS`
`166`	`166`	`InputActionsEditorSettingsProvider.SetIMGUIDropdownVisible(true, false);`
`@@ -171,19 +171,16 @@ private void ShowDropdown(Rect rect, SerializedProperty serializedProperty, Acti`
`171`	`171`	`m_PickerState,`
`172`	`172`	`path =>`
`173`	`173`	`{`
`174`		`- serializedProperty.stringValue = path;`
`175`	`174`	`m_PickerState.manualPathEditMode = false;`
`176`		`- modifiedCallback();`
	`175`	`+ modifiedCallback(path);`
`177`	`176`	`});`
`178`	`177`	`}`
`179`	`178`
`180`	`179`	`m_PickerDropdown.SetPickedCallback(path =>`
`181`	`180`	`{`
`182`	`181`	`//At this point, the serialized property can sometines be referencing the old input actions asset`
`183`		`- Debug.Log(serializedProperty.serializedObject.targetObject.GetInstanceID());`
`184`		`- serializedProperty.stringValue = path;`
`185`	`182`	`m_PickerState.manualPathEditMode = false;`
`186`		`- modifiedCallback();`
	`183`	`+ modifiedCallback(path);`
`187`	`184`	`});`
`188`	`185`
`189`	`186`	`m_PickerDropdown.SetControlPathsToMatch(m_ControlPathsToMatch);`
`@@ -204,7 +201,7 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)`
`204`	`201`	`}`
`205`	`202`
`206`	`203`	`public SerializedProperty pathProperty { get; }`
`207`		`- public Action onModified { get; }`
	`204`	`+ public Action<string> onModified { get; }`
`208`	`205`
`209`	`206`	`private GUIContent m_PathLabel;`
`210`	`207`	`private string m_ExpectedControlLayout;`
`@@ -215,6 +212,7 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)`
`215`	`212`	`private InputControlPickerDropdown m_PickerDropdown;`
`216`	`213`	`private readonly InputControlPickerState m_PickerState;`
`217`	`214`	`private InputActionRebindingExtensions.RebindingOperation m_RebindingOperation;`
	`215`	`+`
`218`	`216`	`}`
`219`	`217`	`}`
`220`	`218`	`#endif // UNITY_EDITOR`
Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,7 @@ protected override void ItemSelected(AdvancedDropdownItem item)`
`127`	`127`	`InputActionsEditorSettingsProvider.SetIMGUIDropdownVisible(false, true);`
`128`	`128`	`#endif`
`129`	`129`	`var path = ((InputControlDropdownItem)item).controlPathWithDevice;`
	`130`	`+ Debug.Log("Picked: " + path);`
`130`	`131`	`m_OnPickCallback(path);`
`131`	`132`	`}`
`132`	`133`
Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,20 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten`
`39`	`39`	`if (m_Editor == null)`
`40`	`40`	`{`
`41`	`41`	`m_Editor = new InputControlPathEditor(property, m_PickerState,`
`42`		`- () => property.serializedObject.ApplyModifiedProperties(),`
	`42`	`+ (path) =>`
	`43`	`+ {`
	`44`	`+ property.stringValue = path;`
	`45`	`+ property.serializedObject.ApplyModifiedProperties();`
	`46`	`+ },`
`43`	`47`	`label: label);`
`44`	`48`	`}`
`45`		`-`
	`49`	`+`
`46`	`50`	`EditorGUI.BeginProperty(position, label, property);`
`47`		`- m_Editor.OnGUI(position, label, property, () => property.serializedObject.ApplyModifiedProperties());`
	`51`	`+ m_Editor.OnGUI(position, label, property, (path) =>`
	`52`	`+ {`
	`53`	`+ property.stringValue = path;`
	`54`	`+ property.serializedObject.ApplyModifiedProperties();`
	`55`	`+ });`
`48`	`56`	`EditorGUI.EndProperty();`
`49`	`57`	`}`
`50`	`58`	`}`