Updated changes with recent GetNavigationEventDeviceType method.

Unity-Technologies · Jan 10, 2025 · cdda2bd · cdda2bd
1 parent ffd26de
commit cdda2bd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Assets/Tests/InputSystem/Plugins/UITests.cs b/Assets/Tests/InputSystem/Plugins/UITests.cs
@@ -2916,7 +2916,8 @@ public IEnumerator UI_CanDriveUIFromGamepad()
                 OneEvent("moveVector", gamepad.leftStick.ReadValue())));
         Assert.That(scene.rightChildReceiver.events, Is.Empty);
 
-        Assert.That(scene.uiModule.IsNonKeyboardNavigationEvent(scene.leftChildReceiver.events[0].data));
+        Assert.That(scene.uiModule.GetNavigationEventDeviceType(scene.leftChildReceiver.events[0].data),
+            Is.EqualTo(NavigationDeviceType.NonKeyboard));
 
         scene.leftChildReceiver.events.Clear();
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/UI/InputSystemUIInputModule.cs
@@ -2457,10 +2457,14 @@ public override Vector2 ConvertPointerEventScrollDeltaToTicks(Vector2 scrollDelt
 
 #endif
 
-#if UNITY_INPUT_SYSTEM_INPUT_MODULE_NON_KEYBOARD
-        public override bool IsNonKeyboardNavigationEvent(BaseEventData eventData)
-        {
-            return eventData is INavigationEventData eed && eed.device is not Keyboard;
+#if UNITY_INPUT_SYSTEM_INPUT_MODULE_NAVIGATION_DEVICE_TYPE
+        public override NavigationDeviceType GetNavigationEventDeviceType(BaseEventData eventData)
+        {
+            if (eventData is not INavigationEventData eed)
+                return NavigationDeviceType.Unknown;
+            if (eed.device is Keyboard)
+                return NavigationDeviceType.Keyboard;
+            return NavigationDeviceType.NonKeyboard;
         }
 #endif
 

diff --git a/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef b/Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef
@@ -95,7 +95,7 @@
         {
             "name": "Unity",
             "expression": "6000.1.0b2",
-            "define": "UNITY_INPUT_SYSTEM_INPUT_MODULE_NON_KEYBOARD"
+            "define": "UNITY_INPUT_SYSTEM_INPUT_MODULE_NAVIGATION_DEVICE_TYPE"
         },
         {
             "name": "Unity",