Recommended changes from @ekcoh. Added more #if UNITY_6000_0_OR_NEWER.

Unity-Technologies · Jun 5, 2024 · 8bb47fd · 8bb47fd
1 parent a9df122
commit 8bb47fd
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 deletions.
diff --git a/Assets/Tests/InputSystem/Plugins/UITests.cs b/Assets/Tests/InputSystem/Plugins/UITests.cs
@@ -1174,6 +1174,7 @@ public IEnumerator UI_CanReceivePointerExitsWhenChangingUIStateWithoutMovingPoin
         );
     }
 
+#if UNITY_6000_0_OR_NEWER
     [UnityTest]
     [Category("UI")]
     [TestCase(1.0f, ExpectedResult = -1)]
@@ -1209,6 +1210,7 @@ public IEnumerator UI_ReceivesNormalizedScrollWheelDelta(float scrollWheelDeltaP
             )
         );
     }
+#endif
 
     [UnityTest]
     [Category("UI")]

diff --git a/Packages/com.unity.inputsystem/InputSystem/IInputRuntime.cs b/Packages/com.unity.inputsystem/InputSystem/IInputRuntime.cs
@@ -174,8 +174,11 @@ internal unsafe interface IInputRuntime
 
         Vector2 screenSize { get; }
         ScreenOrientation screenOrientation { get; }
+
+#if UNITY_6000_0_OR_NEWER
         bool normalizeScrollWheelDelta { get; set; }
         float scrollWheelDeltaPerTick { get; }
+#endif
 
         // If analytics are enabled, the runtime receives analytics events from the input manager.
         // See InputAnalytics.

diff --git a/Packages/com.unity.inputsystem/InputSystem/InputManager.cs b/Packages/com.unity.inputsystem/InputSystem/InputManager.cs
@@ -170,8 +170,10 @@ public InputSettings.ScrollDeltaBehavior scrollDeltaBehavior
 
                 m_ScrollDeltaBehavior = value;
 
+#if UNITY_6000_0_OR_NEWER
                 InputRuntime.s_Instance.normalizeScrollWheelDelta =
                     m_ScrollDeltaBehavior == InputSettings.ScrollDeltaBehavior.UniformAcrossAllPlatforms;
+#endif
             }
         }
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs b/Packages/com.unity.inputsystem/InputSystem/InputSystem.cs
@@ -3423,7 +3423,9 @@ public static bool runInBackground
             set => s_Manager.m_Runtime.runInBackground = value;
         }
 
+#if UNITY_6000_0_OR_NEWER
         internal static float scrollWheelDeltaPerTick => InputRuntime.s_Instance.scrollWheelDeltaPerTick;
+#endif
 
         ////REVIEW: restrict metrics to editor and development builds?
         /// <summary>

diff --git a/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs b/Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs
@@ -281,24 +281,18 @@ private void OnFocusChanged(bool focus)
         public Vector2 screenSize => new Vector2(Screen.width, Screen.height);
         public ScreenOrientation screenOrientation => Screen.orientation;
 
+#if UNITY_6000_0_OR_NEWER
         public bool normalizeScrollWheelDelta
         {
-#if UNITY_6000_0_OR_NEWER
             get => NativeInputSystem.normalizeScrollWheelDelta;
             set => NativeInputSystem.normalizeScrollWheelDelta = value;
-#else
-            get; set;
-#endif
         }
 
         public float scrollWheelDeltaPerTick
         {
-#if UNITY_6000_0_OR_NEWER
-            get { return NativeInputSystem.GetScrollWheelDeltaPerTick(); }
-#else
-            get => 1.0f;
-#endif
+            get => NativeInputSystem.GetScrollWheelDeltaPerTick();
         }
+#endif
 
         public bool isInBatchMode => Application.isBatchMode;
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs
@@ -2072,9 +2072,11 @@ private void OnScrollCallback(InputAction.CallbackContext context)
 
             state.scrollDelta = context.ReadValue<Vector2>();
 
+#if UNITY_6000_0_OR_NEWER
             // Need to scale as the UI system expects values in the [-1, 1] range.
             // ISXB-704: convert input value to BaseInputModule convention.
             state.scrollDelta *= (1.0f / InputSystem.scrollWheelDeltaPerTick);
+#endif
 
 #if UNITY_2022_3_OR_NEWER
             state.eventData.displayIndex = GetDisplayIndexFor(context.control);