Updated for latest trunk PR changes (5f81a20).

Unity-Technologies · May 30, 2024 · 8ecdb01 · 8ecdb01
1 parent 680d8c8
commit 8ecdb01
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Packages/com.unity.inputsystem/InputSystem/IInputRuntime.cs b/Packages/com.unity.inputsystem/InputSystem/IInputRuntime.cs
@@ -174,7 +174,7 @@ internal unsafe interface IInputRuntime
 
         Vector2 screenSize { get; }
         ScreenOrientation screenOrientation { get; }
-        bool allowPlatformSpecificInputForScrollWheelDelta { get; set; }
+        bool normalizeScrollWheelDelta { get; set; }
         float scrollWheelDeltaPerTick { get; }
 
         // If analytics are enabled, the runtime receives analytics events from the input manager.

diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs
@@ -169,8 +169,8 @@ public InputSettings.ScrollDeltaBehavior scrollDeltaBehavior
 
                 m_ScrollDeltaBehavior = value;
 
-                InputRuntime.s_Instance.allowPlatformSpecificInputForScrollWheelDelta =
-                    m_ScrollDeltaBehavior == InputSettings.ScrollDeltaBehavior.KeepPlatformSpecificInputRange;
+                InputRuntime.s_Instance.normalizeScrollWheelDelta =
+                    m_ScrollDeltaBehavior == InputSettings.ScrollDeltaBehavior.UniformAcrossAllPlatforms;
             }
         }
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs b/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs
@@ -281,11 +281,11 @@ private void OnFocusChanged(bool focus)
         public Vector2 screenSize => new Vector2(Screen.width, Screen.height);
         public ScreenOrientation screenOrientation => Screen.orientation;
 
-        public bool allowPlatformSpecificInputForScrollWheelDelta
+        public bool normalizeScrollWheelDelta
         {
 #if UNITY_6000_0_OR_NEWER
-            get => NativeInputSystem.allowPlatformSpecificInputForScrollWheelDelta;
-            set => NativeInputSystem.allowPlatformSpecificInputForScrollWheelDelta = value;
+            get => NativeInputSystem.normalizeScrollWheelDelta;
+            set => NativeInputSystem.normalizeScrollWheelDelta = value;
 #else
             get; set;
 #endif

diff --git a/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestRuntime.cs b/Packages/com.unity.inputsystem/Tests/TestFixture/InputTestRuntime.cs
@@ -371,7 +371,7 @@ public struct PairedUser
 
         public Vector2 screenSize { get; set; } = new Vector2(1024, 768);
         public ScreenOrientation screenOrientation { set; get; } = ScreenOrientation.Portrait;
-        public bool allowPlatformSpecificInputForScrollWheelDelta { get; set; }
+        public bool normalizeScrollWheelDelta { get; set; } = true;
         public float scrollWheelDeltaPerTick { get; } = 1.0f;
 
         public List<PairedUser> userAccountPairings