Apply the same scale factor as InputForUI InputManager provider for scroll delta (#1690)

* Apply same scale factor for mouse scroll delta as IM

* Update scroll test to match new value

* Disable tests failing on 2022.3.3f1

* Ignore one more UI test and fix define conditionals

Author: jfreire-unity

Assets/Tests/InputSystem/Plugins/InputForUITests.cs

@@ -118,10 +118,11 @@ public void NavigationMoveWorks()
     [Category("InputForUI")]
     public void SendWheelEvent()
     {
-        var kScrollUGUIScaleFactor = 40f; // See InputSystemProvider OnScrollWheelPerformed() callback
+        var kScrollUGUIScaleFactor = 3.0f; // See InputSystemProvider OnScrollWheelPerformed() callback
         var mouse = InputSystem.AddDevice<Mouse>();
         Update();
-        Set(mouse.scroll.y, -1f * kScrollUGUIScaleFactor);
+        // Make the minimum step of scroll delta to be ±1.0f
+        Set(mouse.scroll.y, -1f / kScrollUGUIScaleFactor);
         Update();
         Assert.IsTrue(m_InputForUIEvents.Count == 1);
         Assert.That(m_InputForUIEvents[0].asPointerEvent.scroll, Is.EqualTo(new Vector2(0, 1)));

Assets/Tests/InputSystem/Plugins/OnScreenTests.cs

@@ -467,6 +467,7 @@ public IEnumerator Devices_CanHaveOnScreenJoystickControls()
     }
 
     [UnityTest]
+    [Ignore("Failing on 2023.3.3f1 https://jira.unity3d.com/browse/ISX-1462")]
     [Category("Devices")]
     public IEnumerator Devices_OnScreenStickDoesNotReceivePointerUpEventsInIsolatedMode()
     {

Assets/Tests/InputSystem/Plugins/UITests.cs

@@ -3885,6 +3885,8 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnScreenSpaceCanv
     [UnityTest]
 #if UNITY_TVOS
     [Ignore("Failing on tvOS https://jira.unity3d.com/browse/ISX-448")]
+#else
+    [Ignore("Failing on 2023.3.3f1 https://jira.unity3d.com/browse/ISX-1462")]
 #endif
     public IEnumerator UI_DisplayIndexMatchesDisplayWithTouchscreenOnOverlayCanvas()
     {
@@ -3987,6 +3989,7 @@ public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnScreenSpaceCanvas()
     }
 
     [UnityTest]
+    [Ignore("Failing on 2023.3.3f1 https://jira.unity3d.com/browse/ISX-1462")]
     public IEnumerator UI_DisplayIndexMatchesDisplayWithMouseOnOverlayCanvas()
     {
         // Setup the Test Scene

Packages/com.unity.inputsystem/InputSystem/Plugins/InputForUI/InputSystemProvider.cs

@@ -43,6 +43,8 @@ internal class InputSystemProvider : IEventProviderImpl
         NavigationEventRepeatHelper m_RepeatHelper = new();
         bool m_ResetSeenEventsOnUpdate;
 
+        const float kScrollUGUIScaleFactor = 3.0f;
+
         static InputSystemProvider()
         {
             // Only if InputSystem is enabled in the PlayerSettings do we set it as the provider.
@@ -518,9 +520,8 @@ void OnScrollWheelPerformed(InputAction.CallbackContext ctx)
             }
 
             // Make it look similar to IMGUI event scroll values.
-            // TODO check how it behaves on macOS
-            scrollDelta.x /= 40.0f;
-            scrollDelta.y /= -40.0f;
+            scrollDelta.x *= kScrollUGUIScaleFactor;
+            scrollDelta.y *= -kScrollUGUIScaleFactor;
 
             DispatchFromCallback(Event.From(new PointerEvent
             {