From 578fcd980c913c2968872f8350432a087df09d9e Mon Sep 17 00:00:00 2001 From: multimodalinput Date: Wed, 7 Aug 2024 09:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=A8=A1=E7=9B=91=E5=90=AC=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: multimodalinput --- multimodalinput/kits/c/input/oh_axis_type.h | 35 ++++--------------- .../kits/c/input/oh_input_manager.h | 27 ++++++++++++++ 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/multimodalinput/kits/c/input/oh_axis_type.h b/multimodalinput/kits/c/input/oh_axis_type.h index 7d5fd8cc456..de141042d51 100644 --- a/multimodalinput/kits/c/input/oh_axis_type.h +++ b/multimodalinput/kits/c/input/oh_axis_type.h @@ -107,56 +107,35 @@ typedef enum InputEvent_AxisEventType { } InputEvent_AxisEventType; /** - * @brief Enumerates axis event source types. + * @brief Enumerates axis event actions. * * @since 12 */ -typedef enum InputEvent_SourceType { - /** - * Indicates that the input source generates events similar to mouse cursor movement, - * button press and release, and wheel scrolling. - * - * @since 12 - */ - SOURCE_TYPE_MOUSE = 1, - /** - * Indicates that the input source generates a touchscreen multi-touch event. - * - * @since 12 - */ - SOURCE_TYPE_TOUCHSCREEN = 2, +typedef enum InputEvent_AxisAction { /** - * Indicates that the input source generates a touchpad multi-touch event. + * Cancel action for the axis input event. * * @since 12 */ - SOURCE_TYPE_TOUCHPAD = 3 -} InputEvent_SourceType; - -/** - * @brief Enumerates axis event actions. - * - * @since 12 - */ -typedef enum InputEvent_AxisAction { + AXIS_ACTION_CANCEL = 0, /** * Start action for the axis input event. * * @since 12 */ - AXIS_ACTION_BEGIN = 5, + AXIS_ACTION_BEGIN, /** * Update action for the axis input event. * * @since 12 */ - AXIS_ACTION_UPDATE = 6, + AXIS_ACTION_UPDATE, /** * End action for the axis input event. * * @since 12 */ - AXIS_ACTION_END = 7, + AXIS_ACTION_END, } InputEvent_AxisAction; #ifdef __cplusplus } diff --git a/multimodalinput/kits/c/input/oh_input_manager.h b/multimodalinput/kits/c/input/oh_input_manager.h index 5ae7d4df7ca..1e6c0dd85af 100644 --- a/multimodalinput/kits/c/input/oh_input_manager.h +++ b/multimodalinput/kits/c/input/oh_input_manager.h @@ -146,6 +146,33 @@ typedef enum Input_TouchEventAction { TOUCH_ACTION_UP = 3, } Input_TouchEventAction; +/** + * @brief Enumerates event source types. + * + * @since 12 + */ +typedef enum InputEvent_SourceType { + /** + * Indicates that the input source generates events similar to mouse cursor movement, + * button press and release, and wheel scrolling. + * + * @since 12 + */ + SOURCE_TYPE_MOUSE = 1, + /** + * Indicates that the input source generates a touchscreen multi-touch event. + * + * @since 12 + */ + SOURCE_TYPE_TOUCHSCREEN = 2, + /** + * Indicates that the input source generates a touchpad multi-touch event. + * + * @since 12 + */ + SOURCE_TYPE_TOUCHPAD = 3 +} InputEvent_SourceType; + /** * @brief Defines key information, which identifies a key pressing behavior. For example, the Ctrl key information contains the key value and key type. * -- Gitee