Merge branch 'develop' into fix/ISXB-1319/input-recorder-game-view-focus

Author: MorganHoarau

.github/workflows/check-runtime-editor-refs.yml

@@ -0,0 +1,20 @@
+name: Check Editor references in Runtime code
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+    branches: [ "develop" ]
+
+  workflow_dispatch:
+
+jobs:
+  check-runtime-editor-refs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check Runtime code has no Editor namespace references
+        run: bash check-runtime-editor-refs.sh

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Removed 32-bit compilation check for HID on Windows players, which had no impact anymore. (ISX-2543)
 - Migrated sample scenes to use Universal Render Pipeline (URP) with Built-in Render Pipeline fallback shaders. The URP package is now required to run the samples. (ISX-2343)
 - Changed the UI for `Actions.inputactions` asset to use UI Toolkit framework.
+- Changed the UI for `InputSystem.inputsettings` asset to use UI Toolkit framework.
 
 ### Added
 

Packages/com.unity.inputsystem/InputSystem/Editor/InputAssetEditorUtils.cs

@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using UnityEditor;
+using UnityEngine.UIElements;
 
 namespace UnityEngine.InputSystem.Editor
 {
@@ -82,12 +83,32 @@ internal static T CreateAsset<T>(T asset, string relativePath) where T : Scripta
             return asset;
         }
 
-        public static void DrawMakeActiveGui<T>(T current, T target, string targetName, string entity, Action<T> apply, bool allowAssignActive = true)
+        public static VisualElement CreateMakeActiveGui<T>(Func<T> getCurrent, T target, string targetName, string entity,
+            Action<T> apply, Action<Action> subscribeToChanges, Action<Action> unsubscribeFromChanges,
+            bool allowAssignActive = true)
             where T : ScriptableObject
         {
+            var container = new VisualElement();
+
+            void Refresh() => PopulateMakeActiveGui(container, getCurrent(), target, entity, apply, allowAssignActive);
+
+            Refresh();
+
+            // Subscribe for as long as the element is part of a panel, matching the pattern used in InputParameterEditor.
+            container.RegisterCallback<AttachToPanelEvent>(_ => subscribeToChanges(Refresh));
+            container.RegisterCallback<DetachFromPanelEvent>(_ => unsubscribeFromChanges(Refresh));
+
+            return container;
+        }
+
+        private static void PopulateMakeActiveGui<T>(VisualElement container, T current, T target, string entity, Action<T> apply, bool allowAssignActive)
+            where T : ScriptableObject
+        {
+            container.Clear();
+
             if (current == target)
             {
-                EditorGUILayout.HelpBox($"These actions are assigned as the {entity}.", MessageType.Info);
+                container.Add(new HelpBox($"These actions are assigned as the {entity}.", HelpBoxMessageType.Info));
                 return;
             }
 
@@ -96,11 +117,26 @@ public static void DrawMakeActiveGui<T>(T current, T target, string targetName,
                 currentlyActiveAssetsPath = AssetDatabase.GetAssetPath(current);
             if (!string.IsNullOrEmpty(currentlyActiveAssetsPath))
                 currentlyActiveAssetsPath = $" The actions currently assigned as the {entity} are: {currentlyActiveAssetsPath}. ";
-            EditorGUILayout.HelpBox($"These actions are not assigned as the {entity} for the Input System. {currentlyActiveAssetsPath??""}", MessageType.Warning);
-            GUI.enabled = allowAssignActive;
-            if (GUILayout.Button($"Assign as the {entity}", EditorStyles.miniButton))
+
+            container.Add(new HelpBox(
+                $"These actions are not assigned as the {entity} for the Input System. {currentlyActiveAssetsPath ?? ""}",
+                HelpBoxMessageType.Warning));
+
+            var assignButton = new Button(() =>
+            {
                 apply(target);
-            GUI.enabled = true;
+                PopulateMakeActiveGui(container, target, target, entity, apply, allowAssignActive);
+            })
+            {
+                text = $"Assign as the {entity}",
+                style =
+                {
+                    minHeight = 30,
+                    whiteSpace = WhiteSpace.Normal
+                }
+            };
+            assignButton.SetEnabled(allowAssignActive);
+            container.Add(assignButton);
         }
 
         public static bool IsValidFileExtension(string path)

Packages/com.unity.inputsystem/InputSystem/Editor/InputSystemEditorInitializer.cs

@@ -277,6 +277,8 @@ private static void RegisterAssetDatabaseHooks()
             InputManager.s_GetProjectWideActions = () => ProjectWideActionsBuildProvider.actionsToIncludeInPlayerBuild;
 
             InputActionReference.s_CheckImmutableReference = CheckImmutableInputActionReference;
+
+            InputSettings.s_GetIsInspectorIndented = () => EditorGUI.indentLevel > 0;
         }
 
         /// <summary>

Packages/com.unity.inputsystem/InputSystem/Editor/Settings/InputSettingsProvider.cs

@@ -489,17 +489,36 @@ internal static void ForceReload()
     [CustomEditor(typeof(InputSettings))]
     internal class InputSettingsEditor : UnityEditor.Editor
     {
-        public override void OnInspectorGUI()
+        public override VisualElement CreateInspectorGUI()
         {
-            EditorGUILayout.Space();
+            var root = new VisualElement();
 
-            if (GUILayout.Button("Open Input Settings Window", GUILayout.Height(30)))
-                InputSettingsProvider.Open();
-
-            EditorGUILayout.Space();
+            var openButton = new Button(() => InputSettingsProvider.Open())
+            {
+                text = "Open Input Settings Window",
+                style = { minHeight = 30, whiteSpace = WhiteSpace.Normal }
+            };
+            root.Add(openButton);
+
+            // UndoRedoCallback is void(), not Action, so an adapter is required.
+            // The variable is shared between the two lambdas so the same instance is removed on unsubscribe.
+            Undo.UndoRedoCallback undoRedoAdapter = null;
+            root.Add(InputAssetEditorUtils.CreateMakeActiveGui(
+                () => InputSystem.settings, target as InputSettings,
+                target.name, "settings", (value) => InputSystem.settings = value,
+                handler =>
+                {
+                    InputSystem.onSettingsChange += handler;
+                    undoRedoAdapter = () => handler();
+                    Undo.undoRedoPerformed += undoRedoAdapter;
+                },
+                handler =>
+                {
+                    InputSystem.onSettingsChange -= handler;
+                    Undo.undoRedoPerformed -= undoRedoAdapter;
+                }));
 
-            InputAssetEditorUtils.DrawMakeActiveGui(InputSystem.settings, target as InputSettings,
-                target.name, "settings", (value) => InputSystem.settings = value);
+            return root;
         }
 
         protected override bool ShouldHideOpenButton()

Packages/com.unity.inputsystem/InputSystem/Runtime/InputManager.LegacyFocusHandling.cs.meta

@@ -988,7 +988,10 @@ public enum InputActionPropertyDrawerMode
         /// * support inspector view which only work in IMGUI for now.
         /// * prevent the UI to be rendered in IMGUI and UI Toolkit in the Input Actions Editor window.
         /// </summary>
-        public bool useIMGUIEditorForAssets => UnityEditor.EditorGUI.indentLevel > 0 || IsFeatureEnabled(InputFeatureNames.kUseIMGUIEditorForAssets);
+        public bool useIMGUIEditorForAssets =>
+            (s_GetIsInspectorIndented?.Invoke() == true) || IsFeatureEnabled(InputFeatureNames.kUseIMGUIEditorForAssets);
+
+        internal static Func<bool> s_GetIsInspectorIndented;
 #endif
 
         private static bool CompareFloats(float a, float b)

Packages/com.unity.inputsystem/InputSystem/Runtime/InputSettings.cs

@@ -0,0 +1,67 @@
+#!/bin/bash
+[ -n "$BASH_VERSION" ] || { echo "ERROR: This script requires bash. Run with: bash $0" >&2; exit 1; }
+set -euo pipefail
+
+RUNTIME_DIR="Packages/com.unity.inputsystem/InputSystem/Runtime"
+
+# POSIX ERE patterns for grep -E, compatible with macOS (BSD grep) and Ubuntu (GNU grep).
+# No \b word boundaries — not portable across both. False positive risk is negligible
+# since no real identifiers contain these namespace roots as substrings.
+# (\.[A-Za-z0-9_]+)* covers sub-namespaces (UnityEditor.UI, …Editor.Tools, …).
+# Add more lines as needed, e.g. 'UnityEditorInternal(\.[A-Za-z0-9_]+)*'
+FORBIDDEN_REGEX=(
+    'UnityEditor(\.[A-Za-z0-9_]+)*'
+    'UnityEngine\.InputSystem\.Editor(\.[A-Za-z0-9_]+)*'
+)
+
+RED=$'\033[0;31m'
+GREEN=$'\033[0;32m'
+NC=$'\033[0m'
+
+INCLUDE_COMMENTS=false
+for arg in "$@"; do
+    case "$arg" in
+        --include-comments) INCLUDE_COMMENTS=true ;;
+        --help)
+            cat <<EOF
+Usage: $(basename "$0") [OPTIONS]
+
+Check that Runtime code has no Editor namespace dependencies.
+Edit FORBIDDEN_REGEX in this script to add patterns.
+
+Options:
+  --include-comments   Also flag references inside XML doc and // comments
+  --help               Show this help
+EOF
+            exit 0 ;;
+        *) echo "Unknown option: $arg"; exit 1 ;;
+    esac
+done
+
+[ -d "$RUNTIME_DIR" ] || { echo "${RED}ERROR: Runtime directory not found: $RUNTIME_DIR${NC}" >&2; exit 1; }
+
+COMBINED=$(IFS='|'; echo "${FORBIDDEN_REGEX[*]}")
+
+GREP_OUTPUT=$(grep -rnw --include='*.cs' --color=never -E "$COMBINED" "$RUNTIME_DIR" || true)
+
+if [ "$INCLUDE_COMMENTS" = false ]; then
+    VIOLATIONS=$(echo "$GREP_OUTPUT" | grep -Ev ':[0-9]+:[[:space:]]*//' || true)
+else
+    VIOLATIONS="$GREP_OUTPUT"
+fi
+
+if [ -z "$VIOLATIONS" ]; then
+    echo "${GREEN}PASS: No Editor namespace references found in Runtime code.${NC}"
+    exit 0
+fi
+
+VIOLATION_COUNT=$(echo "$VIOLATIONS" | wc -l | tr -d ' ')
+echo "${RED}FAIL: Found $VIOLATION_COUNT Editor namespace reference(s) in Runtime code:${NC}"
+echo ""
+echo "$VIOLATIONS"
+echo ""
+echo "${RED}Active patterns:${NC}"
+for re in "${FORBIDDEN_REGEX[@]}"; do
+    printf '  \033[0;31m%s\033[0m\n' "$re"
+done
+exit 1