From 369326fe962db82b62db83cdc7c719d4e9c7a37a Mon Sep 17 00:00:00 2001 From: Cobrand Date: Mon, 30 Dec 2019 16:50:27 +0000 Subject: [PATCH] Joy/controller Events all have which of u32 --- src/sdl2/event.rs | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs index 6c9dfff6..e0cb57ce 100644 --- a/src/sdl2/event.rs +++ b/src/sdl2/event.rs @@ -539,7 +539,7 @@ pub enum Event { JoyAxisMotion { timestamp: u32, /// The joystick's `id` - which: i32, + which: u32, axis_idx: u8, value: i16 }, @@ -547,7 +547,7 @@ pub enum Event { JoyBallMotion { timestamp: u32, /// The joystick's `id` - which: i32, + which: u32, ball_idx: u8, xrel: i16, yrel: i16 @@ -556,7 +556,7 @@ pub enum Event { JoyHatMotion { timestamp: u32, /// The joystick's `id` - which: i32, + which: u32, hat_idx: u8, state: HatState }, @@ -564,31 +564,31 @@ pub enum Event { JoyButtonDown { timestamp: u32, /// The joystick's `id` - which: i32, + which: u32, button_idx: u8 }, JoyButtonUp { timestamp: u32, /// The joystick's `id` - which: i32, + which: u32, button_idx: u8 }, JoyDeviceAdded { timestamp: u32, /// The newly added joystick's `joystick_index` - which: i32 + which: u32 }, JoyDeviceRemoved { timestamp: u32, /// The joystick's `id` - which: i32 + which: u32 }, ControllerAxisMotion { timestamp: u32, /// The controller's joystick `id` - which: i32, + which: u32, axis: Axis, value: i16 }, @@ -596,30 +596,30 @@ pub enum Event { ControllerButtonDown { timestamp: u32, /// The controller's joystick `id` - which: i32, + which: u32, button: Button }, ControllerButtonUp { timestamp: u32, /// The controller's joystick `id` - which: i32, + which: u32, button: Button }, ControllerDeviceAdded { timestamp: u32, /// The newly added controller's `joystick_index` - which: i32 + which: u32 }, ControllerDeviceRemoved { timestamp: u32, /// The controller's joystick `id` - which: i32 + which: u32 }, ControllerDeviceRemapped { timestamp: u32, /// The controller's joystick `id` - which: i32 + which: u32 }, FingerDown {