projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Making DALi public API typesafe using guaranteed types; uint8_t, uint32_t
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
events
/
wheel-event.h
diff --git
a/dali/public-api/events/wheel-event.h
b/dali/public-api/events/wheel-event.h
index
a0edc8f
..
541b33e
100644
(file)
--- a/
dali/public-api/events/wheel-event.h
+++ b/
dali/public-api/events/wheel-event.h
@@
-18,6
+18,9
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
+#include <cstdint> // uint32_t
+
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/math/vector2.h>
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/math/vector2.h>
@@
-72,7
+75,7
@@
struct DALI_CORE_API WheelEvent
* @param[in] z The offset of rolling (positive value means roll down or clockwise, and negative value means roll up or counter-clockwise)
* @param[in] timeStamp The time the wheel is being rolled
*/
* @param[in] z The offset of rolling (positive value means roll down or clockwise, and negative value means roll up or counter-clockwise)
* @param[in] timeStamp The time the wheel is being rolled
*/
- WheelEvent( Type type, int
direction, unsigned int modifiers, Vector2 point, int z, unsigned in
t timeStamp );
+ WheelEvent( Type type, int
32_t direction, uint32_t modifiers, Vector2 point, int32_t z, uint32_
t timeStamp );
/**
* @brief Destructor.
/**
* @brief Destructor.
@@
-118,12
+121,12
@@
struct DALI_CORE_API WheelEvent
*
* 0 means the default vertical wheel, and 1 means horizontal wheel.
*/
*
* 0 means the default vertical wheel, and 1 means horizontal wheel.
*/
- int direction;
+ int
32_t
direction;
/**
* @brief Modifier keys pressed during the event (such as shift, alt and control).
*/
/**
* @brief Modifier keys pressed during the event (such as shift, alt and control).
*/
- u
nsigned in
t modifiers;
+ u
int32_
t modifiers;
/**
* @brief The co-ordinates of the cursor relative to the top-left of the screen
/**
* @brief The co-ordinates of the cursor relative to the top-left of the screen
@@
-135,12
+138,12
@@
struct DALI_CORE_API WheelEvent
* @brief The offset of the wheel rolling, where positive value means rolling down or clockwise
* and negative value means rolling up or counter-clockwise.
*/
* @brief The offset of the wheel rolling, where positive value means rolling down or clockwise
* and negative value means rolling up or counter-clockwise.
*/
- int z;
+ int
32_t
z;
/**
* @brief The time when the wheel is being rolled.
*/
/**
* @brief The time when the wheel is being rolled.
*/
- u
nsigned in
t timeStamp;
+ u
int32_
t timeStamp;
};
};