NEW: Add option to reset project-wide actions to original state (ISX-1564) (#1793)

* restore default settings

* made left click work on menu button

* hide menu for project input action asset

* fixed icon for reset menu

* added changelog

* PR refactor

* applied event change for postSaveAction as well

---------

Co-authored-by: James McGill <jamesmcgill@users.noreply.github.com>

Author: ritamerkl

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -26,6 +26,7 @@ however, it has to be formatted properly to pass verification tests.
 - Support for [Game rotation vector](https://developer.android.com/reference/android/hardware/Sensor#TYPE_GAME_ROTATION_VECTOR) sensor on Android
 - Duplicate Input Action Items in the new Input Action Asset Editor with Ctrl+D (Windows) or Cmd+D (Mac)
 - Selection of InputActionReferences from project-wide actions on fields that are of type InputActionReference. Uses a new advanced object picker that allows better searching and filtering of actions.
+- Reset project wide Input Settings to default via a new Kebab-menu in Input System Project Settings.
 
 ### Fixed
 - Partially fixed case ISX-1357 (Investigate performance regressing over time).  A sample showed that leaving an InputActionMap enabled could lead to an internal list of listeners growing.  This leads to slow-down, so we now warn if we think this is happening.

Packages/com.unity.inputsystem/InputSystem/Editor/ProjectWideActions/ProjectWideActionsAsset.cs

@@ -51,7 +51,7 @@ internal static InputActionAsset GetOrCreate()
             return CreateNewActionAsset();
         }
 
-        private static InputActionAsset CreateNewActionAsset()
+        internal static InputActionAsset CreateNewActionAsset()
         {
             var json = File.ReadAllText(Path.Combine(Environment.CurrentDirectory, s_DefaultAssetPath));
 

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

@@ -366,6 +366,16 @@ public static Command ChangeCompositeName(int actionMapIndex, int bindingIndex,
                 return state;
             };
         }
+
+        public static Command ResetGlobalInputAsset(Action<InputActionAsset> postResetAction)
+        {
+            return (in InputActionsEditorState state) =>
+            {
+                var asset = ProjectWideActionsAsset.CreateNewActionAsset();
+                postResetAction?.Invoke(asset);
+                return state;
+            };
+        }
     }
 }
 

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorSettingsProvider.cs

@@ -96,7 +96,8 @@ private void BuildUI()
             m_StateContainer = new StateContainer(m_RootVisualElement, m_State);
             m_StateContainer.StateChanged += OnStateChanged;
             m_RootVisualElement.styleSheets.Add(InputActionsEditorWindowUtils.theme);
-            new InputActionsEditorView(m_RootVisualElement, m_StateContainer, null);
+            var view = new InputActionsEditorView(m_RootVisualElement, m_StateContainer);
+            view.postResetAction += OnResetAsset;
             m_StateContainer.Initialize();
 
             // Hide the save / auto save buttons in the project wide input actions
@@ -109,6 +110,12 @@ private void BuildUI()
             }
         }
 
+        private void OnResetAsset(InputActionAsset newAsset)
+        {
+            var serializedAsset = new SerializedObject(newAsset);
+            m_State = new InputActionsEditorState(serializedAsset);
+        }
+
         [SettingsProvider]
         public static SettingsProvider CreateGlobalInputActionsEditorProvider()
         {

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/InputActionsEditorWindow.cs

@@ -169,7 +169,8 @@ private void BuildUI()
             stateContainer.StateChanged += OnStateChanged;
 
             rootVisualElement.styleSheets.Add(InputActionsEditorWindowUtils.theme);
-            var view = new InputActionsEditorView(rootVisualElement, stateContainer, PostSaveAction);
+            var view = new InputActionsEditorView(rootVisualElement, stateContainer);
+            view.postSaveAction += PostSaveAction;
             stateContainer.Initialize();
         }
 

Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/InputActionsEditor.uxml

@@ -2,15 +2,16 @@
     <Style src="project://database/Packages/com.unity.inputsystem/InputSystem/Editor/UITKAssetEditor/Resources/InputActionsEditorStyles.uss?fileID=7433441132597879392&amp;guid=7dac9c49a90bca4499371d0adc9b617b&amp;type=3#InputActionsEditorStyles" />
     <ui:VisualElement name="header" class="header">
         <ui:Label text="Input Actions" display-tooltip-when-elided="true" name="title-label" class="header-label" style="width: auto; margin-left: 0; margin-right: 0; margin-top: 0; margin-bottom: 0;" />
-        <uie:ToolbarSearchField focusable="true" name="search-actions-text-field" class="search-field" />
+        <uie:ToolbarSearchField focusable="true" name="search-actions-text-field" class="search-field" style="display: none;" />
+        <ui:VisualElement name="asset-menu" style="flex-grow: 0; background-color: rgba(0, 0, 0, 0); width: 16px; flex-shrink: 0; -unity-background-scale-mode: scale-to-fit;" />
     </ui:VisualElement>
     <ui:VisualElement name="control-schemes-toolbar-container">
         <uie:Toolbar>
             <ui:VisualElement style="flex-direction: row; flex-grow: 1;">
                 <uie:ToolbarMenu display-tooltip-when-elided="true" text="No Control Schemes" name="control-schemes-toolbar-menu" style="min-width: 135px;" />
                 <uie:ToolbarMenu display-tooltip-when-elided="true" text="All Devices" enabled="false" name="control-schemes-filter-toolbar-menu" />
             </ui:VisualElement>
-            <ui:VisualElement style="flex-direction: row; justify-content: flex-end;" name="save-asset-toolbar-container">
+            <ui:VisualElement name="save-asset-toolbar-container" style="flex-direction: row; justify-content: flex-end;">
                 <uie:ToolbarButton text="Save Asset" display-tooltip-when-elided="true" name="save-asset-toolbar-button" style="align-items: auto;" />
                 <uie:ToolbarToggle focusable="false" label="Auto-Save" name="auto-save-toolbar-toggle" style="width: 69px;" />
             </ui:VisualElement>

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

@@ -1,11 +1,16 @@
-/*****************************************************************************/
-/* Global                                                                      */
-/*****************************************************************************/
-
 .unity-input-actions-editor-hidden {
     display: none;
 }
 
+.asset-menu-button-dark-theme {
+    background-image: resource('d__Menu.png');
+}
+
+.asset-menu-button {
+    background-image: resource('_Menu.png');
+    -unity-background-scale-mode: scale-to-fit;
+}
+
 .body-panel-container {
     min-width: 150px;
     border-top-width: 1px;
@@ -29,7 +34,7 @@
     border-width: 0;
 }
 
-#add-new-action-button  {
+#add-new-action-button {
     background-color: transparent;
     border-width: 0;
 }
@@ -171,12 +176,12 @@
 .name-and-parameters-list-view .delete {
     background-image: resource('Toolbar Minus.png');
 }
+
 .name-and-parameters-list-view .deleteDarkTheme {
     background-image: resource('d_Toolbar Minus.png');
 }
 
 .search-field {
-    /* hide while not implemented */
     display: none;
     width: 190px;
 }

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

@@ -17,9 +17,6 @@ internal static class ContextMenu
 
         private static readonly string add_Action_String = "Add Action";
         private static readonly string add_Binding_String = "Add Binding";
-        private static readonly string add_positiveNegative_Binding_String = "Add Positive\\Negative Binding";
-        private static readonly string add_oneModifier_Binding_String = "Add Binding With One Modifier";
-        private static readonly string add_twoModifier_Binding_String = "Add Binding With Two Modifiers";
         public static void GetContextMenuForActionMapItem(InputActionMapsTreeViewItem treeViewItem)
         {
             var _ = new ContextualMenuManipulator(menuEvent =>

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

@@ -12,14 +12,15 @@ internal class InputActionsEditorView : ViewBase<InputActionsEditorView.ViewStat
     {
         private const string saveButtonId = "save-asset-toolbar-button";
         private const string autoSaveToggleId = "auto-save-toolbar-toggle";
+        private const string menuButtonId = "asset-menu";
 
-        Action m_PostSaveAction;
+        internal Action postSaveAction;
+        internal Action<InputActionAsset> postResetAction;
 
-        public InputActionsEditorView(VisualElement root, StateContainer stateContainer, Action mpostSaveAction)
+        public InputActionsEditorView(VisualElement root, StateContainer stateContainer)
             : base(stateContainer)
         {
             m_Root = root;
-            m_PostSaveAction = mpostSaveAction;
             BuildUI();
         }
 
@@ -51,6 +52,16 @@ public void BuildUI()
             autoSaveToggle.value = InputEditorUserSettings.autoSaveInputActionAssets;
             autoSaveToggle.RegisterValueChangedCallback(OnAutoSaveToggle);
 
+
+            var assetMenuButton = m_Root.Q<VisualElement>(name: menuButtonId);
+            var isGlobalAsset = stateContainer.GetState().serializedObject.targetObject.name == "ProjectWideInputActions";
+            assetMenuButton.visible = isGlobalAsset;
+            assetMenuButton.AddToClassList(EditorGUIUtility.isProSkin ? "asset-menu-button-dark-theme" : "asset-menu-button");
+            var _ = new ContextualMenuManipulator(menuEvent =>
+            {
+                menuEvent.menu.AppendAction("Reset", _ => OnReset());
+            }) { target = assetMenuButton, activators = { new ManipulatorActivationFilter() {button = MouseButton.LeftMouse} }};
+
             // only register the state changed event here in the parent. Changes will be cascaded
             // into child views.
             stateContainer.StateChanged += OnStateChanged;
@@ -65,14 +76,19 @@ public void BuildUI()
                 });
         }
 
+        private void OnReset()
+        {
+            Dispatch(Commands.ResetGlobalInputAsset(postResetAction));
+        }
+
         private void OnSaveButton()
         {
-            Dispatch(Commands.SaveAsset(m_PostSaveAction));
+            Dispatch(Commands.SaveAsset(postSaveAction));
         }
 
         private void OnAutoSaveToggle(ChangeEvent<bool> evt)
         {
-            Dispatch(Commands.ToggleAutoSave(evt.newValue, m_PostSaveAction));
+            Dispatch(Commands.ToggleAutoSave(evt.newValue, postSaveAction));
         }
 
         public override void RedrawUI(ViewState viewState)