From 917d683811da1e4b826e85bd536d10351ebbf703 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 21 Mar 2024 12:51:59 -0700 Subject: [PATCH] Moved SDL_JoyBallEvent together with the other joystick events --- include/SDL3/SDL_events.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/include/SDL3/SDL_events.h b/include/SDL3/SDL_events.h index 6e076e3f9..4a615f61b 100644 --- a/include/SDL3/SDL_events.h +++ b/include/SDL3/SDL_events.h @@ -337,23 +337,6 @@ typedef struct SDL_MouseMotionEvent float yrel; /**< The relative motion in the Y direction */ } SDL_MouseMotionEvent; -/** - * \brief Joystick trackball motion event structure (event.jball.*) - */ -typedef struct SDL_JoyBallEvent -{ - Uint32 type; /**< ::SDL_JOYBALLMOTION */ - Uint32 reserved; - Uint64 timestamp; /**< In nanoseconds, populated using SDL_GetTicksNS() */ - SDL_JoystickID which; /**< The joystick instance id */ - Uint8 ball; /**< The joystick trackball index */ - Uint8 padding1; - Uint8 padding2; - Uint8 padding3; - Sint16 xrel; /**< The relative motion in the X direction */ - Sint16 yrel; /**< The relative motion in the Y direction */ -} SDL_JoyBallEvent; - /** * Mouse button event structure (event.button.*) */ @@ -406,6 +389,23 @@ typedef struct SDL_JoyAxisEvent Uint16 padding4; } SDL_JoyAxisEvent; +/** + * \brief Joystick trackball motion event structure (event.jball.*) + */ +typedef struct SDL_JoyBallEvent +{ + Uint32 type; /**< ::SDL_JOYBALLMOTION */ + Uint32 reserved; + Uint64 timestamp; /**< In nanoseconds, populated using SDL_GetTicksNS() */ + SDL_JoystickID which; /**< The joystick instance id */ + Uint8 ball; /**< The joystick trackball index */ + Uint8 padding1; + Uint8 padding2; + Uint8 padding3; + Sint16 xrel; /**< The relative motion in the X direction */ + Sint16 yrel; /**< The relative motion in the Y direction */ +} SDL_JoyBallEvent; + /** * Joystick hat position change event structure (event.jhat.*) */