Merge branch 'develop' into fix-changelog

Author: ekcoh

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -11,6 +11,7 @@ however, it has to be formatted properly to pass verification tests.
 ## [Unreleased] - yyyy-mm-dd
 
 ### Added
+- Added the display of the device flag `CanRunInBackground` in device debug view.
 - Added analytics for programmatic `InputAction` setup via `InputActionSetupExtensions` when exiting play-mode.
 
 ## [1.11.1] - 2024-09-26

Packages/com.unity.inputsystem/InputSystem/Devices/InputDevice.cs

@@ -255,6 +255,18 @@ public bool canRunInBackground
                     return !(this is Pointer || this is Keyboard); // Anything but pointers and keyboards considered as being able to run in background.
                 #endif
 
+                return canDeviceRunInBackground;
+            }
+        }
+        /// <summary>
+        /// In editor, it may differ from canRunInBackground depending on the gameViewFocus setting.
+        /// This property is used by Device Debug View
+        /// </summary>
+        /// <value>Whether the device should generate input while in the background.</value>
+        internal bool canDeviceRunInBackground
+        {
+            get
+            {
                 if ((m_DeviceFlags & DeviceFlags.CanRunInBackgroundHasBeenQueried) != 0)
                     return (m_DeviceFlags & DeviceFlags.CanRunInBackground) != 0;
 

Packages/com.unity.inputsystem/InputSystem/Editor/Debugger/InputDeviceDebuggerWindow.cs

@@ -347,6 +347,8 @@ private void UpdateDeviceFlags()
                 flags.Add("DisabledInRuntime");
             if (m_Device.disabledWhileInBackground)
                 flags.Add("DisabledWhileInBackground");
+            if (m_Device.canDeviceRunInBackground)
+                flags.Add("CanRunInBackground");
             m_DeviceFlags = m_Device.m_DeviceFlags;
             m_DeviceFlagsString = string.Join(", ", flags.ToArray());
         }

Packages/com.unity.inputsystem/InputSystem/InputManager.cs

@@ -2893,22 +2893,8 @@ internal void AddAvailableDevicesThatAreNowRecognized()
 
         private bool ShouldRunDeviceInBackground(InputDevice device)
         {
-            var runDeviceInBackground =
-                m_Settings.backgroundBehavior != InputSettings.BackgroundBehavior.ResetAndDisableAllDevices &&
+            return m_Settings.backgroundBehavior != InputSettings.BackgroundBehavior.ResetAndDisableAllDevices &&
                 device.canRunInBackground;
-
-            // In editor, we may override canRunInBackground depending on the gameViewFocus setting.
-            #if UNITY_EDITOR
-            if (runDeviceInBackground)
-            {
-                if (m_Settings.editorInputBehaviorInPlayMode == InputSettings.EditorInputBehaviorInPlayMode.AllDevicesRespectGameViewFocus)
-                    runDeviceInBackground = false;
-                else if (m_Settings.editorInputBehaviorInPlayMode == InputSettings.EditorInputBehaviorInPlayMode.PointersAndKeyboardsRespectGameViewFocus)
-                    runDeviceInBackground = !(device is Pointer || device is Keyboard);
-            }
-            #endif
-
-            return runDeviceInBackground;
         }
 
         internal void OnFocusChanged(bool focus)