Moved the instance counter outside the class to prevent static initialization when not used

Author: bmalrat

Assets/Tests/InputSystem/Plugins/OnScreenTests.cs

@@ -371,25 +371,25 @@ public void Devices_DisablingLastOnScreenControlDoesReportActiveControl()
     {
         var gameObject = new GameObject();
 
-        Assert.That(OnScreenControl.HasAnyActive, Is.False);
+        Assert.That(UGUIOnScreenControlUtils.HasAnyActive, Is.False);
 
         var buttonA = gameObject.AddComponent<OnScreenButton>();
 
-        Assert.That(OnScreenControl.HasAnyActive, Is.True);
+        Assert.That(UGUIOnScreenControlUtils.HasAnyActive, Is.True);
 
         var buttonB = gameObject.AddComponent<OnScreenButton>();
         buttonA.controlPath = "/<Keyboard>/a";
         buttonB.controlPath = "/<Keyboard>/b";
 
-        Assert.That(OnScreenControl.HasAnyActive, Is.True);
+        Assert.That(UGUIOnScreenControlUtils.HasAnyActive, Is.True);
 
         buttonA.enabled = false;
 
-        Assert.That(OnScreenControl.HasAnyActive, Is.True);
+        Assert.That(UGUIOnScreenControlUtils.HasAnyActive, Is.True);
 
         buttonB.enabled = false;
 
-        Assert.That(OnScreenControl.HasAnyActive, Is.False);
+        Assert.That(UGUIOnScreenControlUtils.HasAnyActive, Is.False);
     }
 
     // https://fogbugz.unity3d.com/f/cases/1271942

Packages/com.unity.inputsystem/InputSystem/Plugins/OnScreen/OnScreenControl.cs

@@ -217,18 +217,14 @@ protected void SentDefaultValueToControl()
             InputSystem.QueueEvent(m_InputEventPtr);
         }
 
-        // Used by PlayerInput auto switch for scheme to prevent using Pointer device.
-        internal static bool HasAnyActive => s_nbActiveInstances != 0;
-        private static int s_nbActiveInstances = 0;
-
         protected virtual void OnEnable()
         {
-            ++s_nbActiveInstances;
+            ++UGUIOnScreenControlUtils.s_nbActiveInstances;
             SetupInputControl();
             if (m_Control == null)
                 return;
             // if we are in single player and if it the first active switch to the target device.
-            if (s_nbActiveInstances == 1 &&
+            if (UGUIOnScreenControlUtils.s_nbActiveInstances == 1 &&
                 PlayerInput.isSinglePlayer)
             {
                 var firstPlayer = PlayerInput.GetPlayerByIndex(0);
@@ -255,7 +251,7 @@ protected virtual void OnEnable()
 
         protected virtual void OnDisable()
         {
-            --s_nbActiveInstances;
+            --UGUIOnScreenControlUtils.s_nbActiveInstances;
             if (m_Control == null)
                 return;
 
@@ -349,6 +345,11 @@ internal string GetWarningMessage()
 
     internal static class UGUIOnScreenControlUtils
     {
+        // Used by PlayerInput auto switch for scheme to prevent using Pointer device.
+        // stored outside of the OnScreenControl to static initialization when it's no used
+        internal static bool HasAnyActive => s_nbActiveInstances != 0;
+        internal static int s_nbActiveInstances = 0;
+
         public static RectTransform GetCanvasRectTransform(Transform transform)
         {
             var parentTransform = transform.parent;

Packages/com.unity.inputsystem/InputSystem/Plugins/PlayerInput/PlayerInput.cs

@@ -1869,7 +1869,7 @@ private static bool OnPreFilterUnpairedDeviceUsed(InputDevice device, InputEvent
             // Early out if the device isn't usable with any of our control schemes.
             var actions = all[0].actions;
             // Skip Pointer device if any OnScreenControl is active since they will use it to generate device event
-            return actions != null && (!OnScreenControl.HasAnyActive || !(device is Pointer)) && actions.IsUsableWithDevice(device);
+            return actions != null && (!UGUIOnScreenControlUtils.HasAnyActive || !(device is Pointer)) && actions.IsUsableWithDevice(device);
         }
 
         private void OnUnpairedDeviceUsed(InputControl control, InputEventPtr eventPtr)