diff --git a/.gitee/CODEOWNERS b/.gitee/CODEOWNERS index 4c6b50c82449fc13f824060a57c7e0cb859b8ec3..03f9f36de275f5bdd513a53346bdc4da743e6952 100644 --- a/.gitee/CODEOWNERS +++ b/.gitee/CODEOWNERS @@ -2992,6 +2992,7 @@ frameworks/core/interfaces/native/node/water_flow_modifier.h @arkuiscroll frameworks/core/interfaces/native/node/web_modifier.cpp @arkwebinarkuireview frameworks/core/interfaces/native/node/web_modifier.h @arkwebinarkuireview frameworks/core/interfaces/native/utility/reverse_converter.cpp @huawei_g_five +frameworks/core/interfaces/native/utility/reverse_converter_enums.cpp @arkui_architecture frameworks/core/interfaces/native/ani/web_ani_modifier.cpp @arkwebinarkuireview interfaces/native/BUILD.gn @arkui_architecture interfaces/native/drag_and_drop.h @arkuievent diff --git a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/enums.ts b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/enums.ts index 08d3ba317c42cde01566826894dedf28b537aea7..a1374ee358ee6b80194daddb7b8622f5b53364a2 100644 --- a/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/enums.ts +++ b/frameworks/bridge/arkts_frontend/koala_projects/arkoala-arkts/arkui-ohos/src/component/enums.ts @@ -123,6 +123,8 @@ export enum MouseAction { Move = 3, HOVER = 4, Hover = 4, + WINDOW_ENTER = 5, + WINDOW_LEAVE = 6, CANCEL = 13 } export enum AnimationStatus { diff --git a/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h b/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h index 887292230a180c8d80473cef742cbaee50d56541..4047d75df2cebd39722f95fb565f58774a87e31a 100644 --- a/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h +++ b/frameworks/core/interfaces/native/generated/interface/arkoala_api_generated.h @@ -5172,6 +5172,8 @@ typedef enum Ark_MouseAction { ARK_MOUSE_ACTION_RELEASE = 2, ARK_MOUSE_ACTION_MOVE = 3, ARK_MOUSE_ACTION_HOVER = 4, + ARK_MOUSE_ACTION_WINDOW_ENTER = 5, + ARK_MOUSE_ACTION_WINDOW_LEAVE = 6, ARK_MOUSE_ACTION_CANCEL = 13, } Ark_MouseAction; typedef struct Opt_MouseAction { diff --git a/frameworks/core/interfaces/native/utility/reverse_converter_enums.cpp b/frameworks/core/interfaces/native/utility/reverse_converter_enums.cpp index dc848c2dff62d703ffd1a0ac9b44bc09e9239b69..e8ced585c3ca19fcc8347e68442ef18b0b1cda82 100644 --- a/frameworks/core/interfaces/native/utility/reverse_converter_enums.cpp +++ b/frameworks/core/interfaces/native/utility/reverse_converter_enums.cpp @@ -407,6 +407,8 @@ void AssignArkValue(Ark_MouseAction& dst, const MouseAction& src) case MouseAction::RELEASE: dst = ARK_MOUSE_ACTION_RELEASE; break; case MouseAction::MOVE: dst = ARK_MOUSE_ACTION_MOVE; break; case MouseAction::HOVER: dst = ARK_MOUSE_ACTION_HOVER; break; + case MouseAction::WINDOW_ENTER: dst = ARK_MOUSE_ACTION_WINDOW_ENTER; break; + case MouseAction::WINDOW_LEAVE: dst = ARK_MOUSE_ACTION_WINDOW_LEAVE; break; case MouseAction::CANCEL: dst = ARK_MOUSE_ACTION_CANCEL; break; default: { dst = static_cast(-1);