revert changes

smnwttbr · smnwttbr · commit f35d9f8d5558 · 2025-01-30T12:22:49.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,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,10 @@ private void OnCompositeParametersModified()`
`316`	`316`	`var nameAndParameters = NameAndParameters.Parse(path);`
`317`	`317`	`nameAndParameters.parameters = m_CompositeParameters.GetParameters();`
`318`	`318`
`319`		`- OnPathChanged(nameAndParameters.ToString());`
	`319`	`+ m_PathProperty.stringValue = nameAndParameters.ToString();`
	`320`	`+ m_PathProperty.serializedObject.ApplyModifiedProperties();`
	`321`	`+`
	`322`	`+ OnPathChanged();`
`320`	`323`	`}`
`321`	`324`
`322`	`325`	`private void OnBindingGroupsChanged()`
`@@ -327,9 +330,8 @@ private void OnBindingGroupsChanged()`
`327`	`330`	`onChange?.Invoke(k_GroupsChanged);`
`328`	`331`	`}`
`329`	`332`
`330`		`- private void OnPathChanged(string path)`
	`333`	`+ private void OnPathChanged()`
`331`	`334`	`{`
`332`		`- m_PathProperty.stringValue = path;`
`333`	`335`	`m_BindingProperty.serializedObject.ApplyModifiedProperties();`
`334`	`336`	`onChange?.Invoke(k_PathChanged);`
`335`	`337`	`}`
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<string> onModified, GUIContent label = null)`
	`29`	`+ public InputControlPathEditor(SerializedProperty pathProperty, InputControlPickerState pickerState, Action 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<string> modifiedCallback = null)`
	`92`	`+ public void OnGUI(Rect rect, GUIContent label = null, SerializedProperty property = null, Action 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(path);`
	`144`	`+ (modifiedCallback ?? onModified).Invoke();`
`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, modifiedCallback ?? onModified);`
	`154`	`+ ShowDropdown(bindingTextRect, serializedProperty, 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, Action<string> modifiedCallback)`
	`163`	`+ private void ShowDropdown(Rect rect, SerializedProperty serializedProperty, Action modifiedCallback)`
`164`	`164`	`{`
`165`	`165`	`#if UNITY_INPUT_SYSTEM_PROJECT_WIDE_ACTIONS`
`166`	`166`	`InputActionsEditorSettingsProvider.SetIMGUIDropdownVisible(true, false);`
`@@ -171,16 +171,17 @@ private void ShowDropdown(Rect rect, Action<string> modifiedCallback)`
`171`	`171`	`m_PickerState,`
`172`	`172`	`path =>`
`173`	`173`	`{`
	`174`	`+ serializedProperty.stringValue = path;`
`174`	`175`	`m_PickerState.manualPathEditMode = false;`
`175`		`- modifiedCallback(path);`
	`176`	`+ modifiedCallback();`
`176`	`177`	`});`
`177`	`178`	`}`
`178`	`179`
`179`	`180`	`m_PickerDropdown.SetPickedCallback(path =>`
`180`	`181`	`{`
`181`		`- //At this point, the serialized property can sometines be referencing the old input actions asset`
	`182`	`+ serializedProperty.stringValue = path;`
`182`	`183`	`m_PickerState.manualPathEditMode = false;`
`183`		`- modifiedCallback(path);`
	`184`	`+ modifiedCallback();`
`184`	`185`	`});`
`185`	`186`
`186`	`187`	`m_PickerDropdown.SetControlPathsToMatch(m_ControlPathsToMatch);`
`@@ -201,7 +202,7 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)`
`201`	`202`	`}`
`202`	`203`
`203`	`204`	`public SerializedProperty pathProperty { get; }`
`204`		`- public Action<string> onModified { get; }`
	`205`	`+ public Action onModified { get; }`
`205`	`206`
`206`	`207`	`private GUIContent m_PathLabel;`
`207`	`208`	`private string m_ExpectedControlLayout;`
`@@ -212,7 +213,6 @@ private void SetExpectedControlLayoutFromAttribute(SerializedProperty property)`
`212`	`213`	`private InputControlPickerDropdown m_PickerDropdown;`
`213`	`214`	`private readonly InputControlPickerState m_PickerState;`
`214`	`215`	`private InputActionRebindingExtensions.RebindingOperation m_RebindingOperation;`
`215`		`-`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`	`#endif // UNITY_EDITOR`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,6 @@ 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);`
`131`	`130`	`m_OnPickCallback(path);`
`132`	`131`	`}`
`133`	`132`
Original file line number	Diff line number	Diff line change
`@@ -39,20 +39,12 @@ 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`		`- (path) =>`
`43`		`- {`
`44`		`- property.stringValue = path;`
`45`		`- property.serializedObject.ApplyModifiedProperties();`
`46`		`- },`
	`42`	`+ () => property.serializedObject.ApplyModifiedProperties(),`
`47`	`43`	`label: label);`
`48`	`44`	`}`
`49`		`-`
	`45`	`+`
`50`	`46`	`EditorGUI.BeginProperty(position, label, property);`
`51`		`- m_Editor.OnGUI(position, label, property, (path) =>`
`52`		`- {`
`53`		`- property.stringValue = path;`
`54`		`- property.serializedObject.ApplyModifiedProperties();`
`55`		`- });`
	`47`	`+ m_Editor.OnGUI(position, label, property, () => property.serializedObject.ApplyModifiedProperties());`
`56`	`48`	`EditorGUI.EndProperty();`
`57`	`49`	`}`
`58`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -282,12 +282,7 @@ private bool HasContentChanged()`
`282`	`282`	`{`
`283`	`283`	`var editedAsset = GetEditedAsset();`
`284`	`284`	`var editedAssetJson = InputActionsEditorWindowUtils.ToJsonWithoutName(editedAsset);`
`285`		`- var hasContentChanged = editedAssetJson != m_AssetJson;`
`286`		`- if (hasContentChanged)`
`287`		`- {`
`288`		`- Debug.LogError("Content Changed");`
`289`		`- }`
`290`		`- return hasContentChanged;`
	`285`	`+ return editedAssetJson != m_AssetJson;`
`291`	`286`	`}`
`292`	`287`
`293`	`288`	`private void DirtyInputActionsEditorWindow(InputActionsEditorState newState)`