Merge branch 'develop' into isxb-543-fix-touch-double-remove

adrian-koretski-unity3d · web-flow · commit 667c1dc66b3e · 2024-10-01T10:26:43.000-04:00
diff --git a/Packages/com.unity.inputsystem/CHANGELOG.md b/Packages/com.unity.inputsystem/CHANGELOG.md
@@ -17,6 +17,9 @@ however, it has to be formatted properly to pass verification tests.
 - Added the display of the device flag `CanRunInBackground` in device debug view.
 - Added analytics for programmatic `InputAction` setup via `InputActionSetupExtensions` when exiting play-mode.
 
+### Fixed
+- Fixed wrong mapping of Xbox Series S|X and Xbox One wireless controllers "View" button on macOS.[ISXB-385](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-385)
+
 ## [1.11.1] - 2024-09-26
 
 ### Fixed
diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/XInput/XboxGamepadMacOS.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/XInput/XboxGamepadMacOS.cs
@@ -111,7 +111,7 @@ internal struct XInputControllerWirelessOSXState : IInputStateTypeInfo
         public enum Button
         {
             Start = 11,
-            Select = 16,
+            Select = 10,
             LeftThumbstickPress = 13,
             RightThumbstickPress = 14,
             LeftShoulder = 6,

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ internal struct XInputControllerWirelessOSXState : IInputStateTypeInfo`
`111`	`111`	`public enum Button`
`112`	`112`	`{`
`113`	`113`	`Start = 11,`
`114`		`- Select = 16,`
	`114`	`+ Select = 10,`
`115`	`115`	`LeftThumbstickPress = 13,`
`116`	`116`	`RightThumbstickPress = 14,`
`117`	`117`	`LeftShoulder = 6,`