Add better fix for the control schemes view closing on autosave.

We now just don't autosave in this case as there is no need.

Author: Darren-Kelly-Unity

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

@@ -168,7 +168,7 @@ private static GUIContent GetEditorTitle(InputActionAsset asset, bool isDirty)
             return new GUIContent(text);
         }
 
-        private void SetAsset(InputActionAsset asset, string actionToSelect = null, string actionMapToSelect = null, bool shouldClearRootVisualElement = true)
+        private void SetAsset(InputActionAsset asset, string actionToSelect = null, string actionMapToSelect = null)
         {
             var existingWorkingCopy = m_AssetObjectForEditing;
 
@@ -189,7 +189,7 @@ private void SetAsset(InputActionAsset asset, string actionToSelect = null, stri
                     m_State = m_State.SelectAction(actionToSelect);
                 }
 
-                BuildUI(shouldClearRootVisualElement);
+                BuildUI();
             }
             catch (Exception e)
             {
@@ -262,7 +262,7 @@ private void CleanupStateContainer()
             }
         }
 
-        private void BuildUI(bool shouldClearRoot = true)
+        private void BuildUI()
         {
             CleanupStateContainer();
 
@@ -271,32 +271,13 @@ private void BuildUI(bool shouldClearRoot = true)
 
             m_StateContainer = new StateContainer(m_State, m_AssetGUID);
             m_StateContainer.StateChanged += OnStateChanged;
-            IEnumerable<VisualElement> children = null;
-            if (!shouldClearRoot)
-            {
-                children = new List<VisualElement>(rootVisualElement.hierarchy.Children());
-            }
 
             rootVisualElement.Clear();
 
             if (!rootVisualElement.styleSheets.Contains(InputActionsEditorWindowUtils.theme))
                 rootVisualElement.styleSheets.Add(InputActionsEditorWindowUtils.theme);
             m_View = new InputActionsEditorView(rootVisualElement, m_StateContainer, false, () => Save(isAutoSave: false));
             m_StateContainer.Initialize(rootVisualElement.Q("action-editor"));
-
-            if (children != null)
-            {
-                foreach (var child in children)
-                {
-                    for (int i = rootVisualElement.hierarchy.childCount - 1; i >= 0; i--)
-                    {
-                        if (rootVisualElement.hierarchy.ElementAt(i).name != child.name)
-                        {
-                            rootVisualElement.hierarchy.Add(child);
-                        }
-                    }
-                }
-            }
         }
 
         private void OnStateChanged(InputActionsEditorState newState, UIRebuildMode editorRebuildMode)
@@ -388,7 +369,7 @@ private void OnLostFocus()
                 // This code should be cleaned up once we migrate the InputControl stuff from ImGUI completely.
                 // Since at that point it stops being a separate window that steals focus.
                 // (See case ISXB-1221)
-                if (!InputControlPathEditor.IsShowingDropdown)
+                if (!InputControlPathEditor.IsShowingDropdown && !ControlSchemesView.IsShowingControlSchemeView)
                     Save(isAutoSave: true);
             #endif
 
@@ -534,7 +515,7 @@ public void OnAssetImported()
             }
 
             // We set shouldClearRootVisualElement to false here as we don't want the root visual element's child elements to be closed during an auto save.
-            SetAsset(AssetDatabase.LoadAssetAtPath<InputActionAsset>(assetPath), shouldClearRootVisualElement: false);
+            SetAsset(AssetDatabase.LoadAssetAtPath<InputActionAsset>(assetPath));
         }
 
         #endregion

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

@@ -14,9 +14,16 @@ internal class ControlSchemesView : ViewBase<InputControlScheme>
         private string m_NewName;
         public event Action<ViewBase<InputControlScheme>> OnClosing;
 
+        /// <summary>
+        /// This property is only set from this class in order to communicate that we're showing the control schemes view at the moment
+        /// It's employed to skip auto-saving, because that complicates the save causing this window to close when adding a new device type.
+        /// </summary>
+        internal static bool IsShowingControlSchemeView { get; private set; }
+
         public ControlSchemesView(VisualElement root, StateContainer stateContainer, bool updateExisting = false)
             : base(root, stateContainer)
         {
+            IsShowingControlSchemeView = true;
             m_UpdateExisting = updateExisting;
 
             var controlSchemeEditor = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>(
@@ -118,6 +125,7 @@ public override void RedrawUI(InputControlScheme viewState)
 
         public override void DestroyView()
         {
+            IsShowingControlSchemeView = false;
             m_ModalWindow.RemoveFromHierarchy();
         }
 
@@ -137,6 +145,8 @@ private void Cancel()
 
         private void CloseView()
         {
+            IsShowingControlSchemeView = false;
+
             // Closing the View without explicitly selecting "Save" or "Cancel" holds the values in the
             // current UI state but won't persist them; the Asset Editor state isn't dirtied.
             //