NEW: Only show matching binding-paths for selected control scheme (ISX-1549) (#1724)

* hide other not matching bindings if control scheme selected

* fixed selected control scheme does not reset issue

Author: ritamerkl

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Commands/ControlSchemeCommands.cs

@@ -80,7 +80,7 @@ public static Command SelectControlScheme(int controlSchemeIndex)
             return (in InputActionsEditorState state) =>
             {
                 if (controlSchemeIndex == -1)
-                    return state.With(selectedControlSchemeIndex: controlSchemeIndex);
+                    return state.With(selectedControlSchemeIndex: controlSchemeIndex, selectedControlScheme: new InputControlScheme());
 
                 var controlSchemeSerializedProperty = state.serializedObject
                     .FindProperty(nameof(InputActionAsset.m_ControlSchemes))

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

@@ -23,6 +23,7 @@ public BindingPropertiesView(VisualElement root, Foldout foldout, StateContainer
                 (_, controlSchemes, s) => new ViewState
                 {
                     controlSchemes = controlSchemes,
+                    currentControlScheme = s.selectedControlScheme,
                     selectedBinding = Selectors.GetSelectedBinding(s),
                     selectedBindingIndex = s.selectedBindingIndex,
                     selectedBindingPath = Selectors.GetSelectedBindingPath(s),
@@ -57,6 +58,7 @@ public override void RedrawUI(ViewState viewState)
             {
                 var controlPathEditor = new InputControlPathEditor(viewState.selectedBindingPath, new InputControlPickerState(),
                     () => { Dispatch(Commands.ApplyModifiedProperties()); });
+                controlPathEditor.SetControlPathsToMatch(viewState.currentControlScheme.deviceRequirements.Select(x => x.controlPath));
 
                 var inputAction = viewState.selectedInputAction;
                 controlPathEditor.SetExpectedControlLayout(inputAction?.expectedControlType ?? "");
@@ -100,6 +102,7 @@ internal class ViewState
             public int selectedBindingIndex;
             public SerializedInputBinding? selectedBinding;
             public ViewStateCollection<InputControlScheme> controlSchemes;
+            public InputControlScheme currentControlScheme;
             public SerializedProperty selectedBindingPath;
             public SerializedInputAction? selectedInputAction;
         }

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

@@ -40,6 +40,7 @@ public override void RedrawUI(ViewState viewState)
             var controlPathEditor = new InputControlPathEditor(viewState.selectedBindingPath, new InputControlPickerState(),
                 () => { Dispatch(Commands.ApplyModifiedProperties()); });
 
+            controlPathEditor.SetControlPathsToMatch(viewState.currentControlScheme.deviceRequirements.Select(x => x.controlPath));
             controlPathEditor.SetExpectedControlLayout(viewState.expectedControlLayoutName);
 
             m_PathEditorContainer.onGUIHandler = controlPathEditor.OnGUI;
@@ -59,6 +60,7 @@ internal class ViewState
             public SerializedProperty selectedBindingPath;
             public SerializedInputBinding selectedBinding;
             public IEnumerable<string> compositePartNames;
+            public InputControlScheme currentControlScheme;
             public string expectedControlLayoutName;
             public string selectedCompositePartName;
         }
@@ -78,6 +80,7 @@ public static CompositePartBindingPropertiesView.ViewState GetCompositePartBindi
                 selectedBinding = binding,
                 selectedBindingPath = GetSelectedBindingPath(state),
                 selectedCompositePartName = selectedCompositePartName,
+                currentControlScheme = state.selectedControlScheme,
                 compositePartNames = compositeParts.Select(ObjectNames.NicifyVariableName).ToList(),
                 expectedControlLayoutName = InputBindingComposite.GetExpectedControlLayoutName(binding.compositePath, binding.name) ?? ""
             };