diff --git a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_row_ffi.cpp b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_row_ffi.cpp index 404eb8f4a945ce9331fefb4424b58ef9629e2ddc..4fc9e69ef0df0b6a557102268e86999c240602e3 100644 --- a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_row_ffi.cpp +++ b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_row_ffi.cpp @@ -81,9 +81,4 @@ void FfiOHOSAceFrameworkRowSetWidth(double width, int32_t unit) FlexModel::GetInstance()->SetHasWidth(); return; } - -void FfiOHOSAceFrameworkRowSetReverse(bool value) -{ - RowModel::GetInstance()->SetIsReverse(value); -} } diff --git a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_row_ffi.h b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_row_ffi.h index dc607e0dfc728ba7c4507ed738f07b3878121cf1..c8653758117eb4d13ef9d8d8aeb017620907607e 100644 --- a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_row_ffi.h +++ b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_row_ffi.h @@ -28,7 +28,6 @@ CJ_EXPORT void FfiOHOSAceFrameworkRowSetAlignItems(int32_t alignItems); CJ_EXPORT void FfiOHOSAceFrameworkRowSetJustifyContent(int32_t justifyContent); CJ_EXPORT void FfiOHOSAceFrameworkRowSetHeight(double height, int32_t unit); CJ_EXPORT void FfiOHOSAceFrameworkRowSetWidth(double width, int32_t unit); -CJ_EXPORT void FfiOHOSAceFrameworkRowSetReverse(bool value); } #endif // OHOS_ACE_FRAMEWORK_CJ_ROW_FFI_H diff --git a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_view_abstract_ffi.cpp b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_view_abstract_ffi.cpp index c94d0c0f07635686cabba0556f57cf6afa399444..a356792f8b478c43c4741cea1935df385f5c4451 100644 --- a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_view_abstract_ffi.cpp +++ b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_view_abstract_ffi.cpp @@ -441,7 +441,6 @@ void FfiOHOSAceFrameworkViewAbstractSetPixelRound(CJPixelRoundPolicy cjValue) } } - int32_t topValue = cjValue.top; if (Utils::CheckParamsValid(topValue, PIXEL_ROUND_CALC_POLICIES.size())) { if (PixelRoundCalcPolicy::FORCE_CEIL == static_cast(topValue)) { @@ -1076,8 +1075,8 @@ void FfiOHOSAceFrameworkViewAbstractSetColorBlend(uint32_t color) ViewAbstractModel::GetInstance()->SetColorBlend(Color(color)); } -void FfiOHOSAceFrameworkViewAbstractSetLinearGradientBlur( - double radius, int32_t direction, VectorFloat64Ptr blurVec, VectorFloat64Ptr positionVec) +void FfiOHOSAceFrameworkViewAbstractSetLinearGradientBlur(double radius, int32_t direction, + VectorFloat64Ptr blurVec, VectorFloat64Ptr positionVec) { double blurRadius = radius; std::vector> fractionStops; @@ -1087,7 +1086,7 @@ void FfiOHOSAceFrameworkViewAbstractSetLinearGradientBlur( return; } float tmpPos = -1.0f; - for (size_t i = 0; i < blurVector.size(); i++) { + for (size_t i = 0; i fractionStop; fractionStop.first = static_cast(std::clamp(blurVector[i], 0.0, 1.0)); fractionStop.second = static_cast(std::clamp(positionVector[i], 0.0, 1.0)); @@ -1300,11 +1299,11 @@ void FfiOHOSAceFrameworkViewAbstractSetOutlineStyle(int32_t style) ViewAbstractModel::GetInstance()->SetOuterBorderStyle(BORDER_STYLES[style]); } -void FfiOHOSAceFrameworkViewAbstractSetOutlineStyles( - int32_t styleTop, int32_t styleRight, int32_t styleBottom, int32_t styleLeft) +void FfiOHOSAceFrameworkViewAbstractSetOutlineStyles(int32_t styleTop, int32_t styleRight, + int32_t styleBottom, int32_t styleLeft) { - ViewAbstractModel::GetInstance()->SetOuterBorderStyle( - BORDER_STYLES[styleLeft], BORDER_STYLES[styleRight], BORDER_STYLES[styleTop], BORDER_STYLES[styleBottom]); + ViewAbstractModel::GetInstance()->SetOuterBorderStyle(BORDER_STYLES[styleLeft], + BORDER_STYLES[styleRight], BORDER_STYLES[styleTop], BORDER_STYLES[styleBottom]); } void FfiOHOSAceFrameworkViewAbstractSetOutlineWidth(double width, int32_t unit) @@ -1346,11 +1345,11 @@ void FfiOHOSAceFrameworkViewAbstractSetOutlineColor(uint32_t value) ViewAbstractModel::GetInstance()->SetOuterBorderColor(Color(value)); } -void FfiOHOSAceFrameworkViewAbstractSetOutlineColors( - uint32_t colorTop, uint32_t colorRight, uint32_t colorBottom, uint32_t colorLeft) +void FfiOHOSAceFrameworkViewAbstractSetOutlineColors(uint32_t colorTop, uint32_t colorRight, + uint32_t colorBottom, uint32_t colorLeft) { - ViewAbstractModel::GetInstance()->SetOuterBorderColor( - Color(colorLeft), Color(colorRight), Color(colorTop), Color(colorBottom)); + ViewAbstractModel::GetInstance()->SetOuterBorderColor(Color(colorLeft), Color(colorRight), + Color(colorTop), Color(colorBottom)); } void FfiOHOSAceFrameworkViewAbstractSetOutlineRadius(double radius, int32_t unit) @@ -2516,20 +2515,20 @@ void ParseSheetCallbackV2(CJSheetOptionsV2 options, std::function& onApp sheetSpringBack = CJLambda::Create(options.onWillSpringBackWhenDismiss.value); } if (options.onHeightDidChange.hasValue) { - onHeightDidChange = [lambda = CJLambda::Create(options.onHeightDidChange.value)]( - const float value) { lambda(value); }; + onHeightDidChange = + [lambda = CJLambda::Create(options.onHeightDidChange.value)](const float value) { lambda(value); }; } if (options.onDetentsDidChange.hasValue) { - onDetentsDidChange = [lambda = CJLambda::Create(options.onDetentsDidChange.value)]( - const float value) { lambda(value); }; + onDetentsDidChange = + [lambda = CJLambda::Create(options.onDetentsDidChange.value)](const float value) { lambda(value); }; } if (options.onWidthDidChange.hasValue) { - onWidthDidChange = [lambda = CJLambda::Create(options.onWidthDidChange.value)]( - const float value) { lambda(value); }; + onWidthDidChange = + [lambda = CJLambda::Create(options.onWidthDidChange.value)](const float value) { lambda(value); }; } if (options.onTypeDidChange.hasValue) { - onTypeDidChange = [lambda = CJLambda::Create(options.onTypeDidChange.value)]( - const float value) { lambda(value); }; + onTypeDidChange = + [lambda = CJLambda::Create(options.onTypeDidChange.value)](const float value) { lambda(value); }; } } @@ -2891,6 +2890,43 @@ void FFIOHOSAceFrameworkFocusScopeId(const char* id, bool isGroup, bool arrowSte ViewAbstractModel::GetInstance()->SetFocusScopeId(id, isGroup, arrowStepOut); } +void FFIOHOSAceFrameworkSetCursor(int32_t pointerStyle) +{ + auto pipelineContext = PipelineContext::GetCurrentContext(); + if (!pipelineContext) { + LOGE("pipeline context is non-valid"); + return; + } + if (!pipelineContext->GetTaskExecutor()) { + LOGE("TaskExecutor is non-valid"); + return; + } + pipelineContext->GetTaskExecutor()->PostSyncTask( + [pipelineContext, pointerStyle]() { pipelineContext->SetCursor(pointerStyle); }, TaskExecutor::TaskType::UI, + "ArkUICjSetCursor"); +} + +void FFIOHOSAceFrameworkRestoreDefault() +{ + auto pipelineContext = PipelineContext::GetCurrentContext(); + if (!pipelineContext) { + LOGE("pipeline context is non-valid"); + return; + } + if (!pipelineContext->GetTaskExecutor()) { + LOGE("TaskExecutor is non-valid"); + return; + } + pipelineContext->GetTaskExecutor()->PostSyncTask( + [pipelineContext]() { pipelineContext->RestoreDefault(0, MouseStyleChangeReason::USER_SET_MOUSESTYLE); }, + TaskExecutor::TaskType::UI, "ArkUICjRestoreDefault"); +} + +void FFIOHOSAceFrameworkMonopolizeEvents(bool monopolize) +{ + ViewAbstractModel::GetInstance()->SetMonopolizeEvents(monopolize); +} + uint32_t FFIOHOSAceFrameworkBlendColor(uint32_t color, uint32_t overlayColor) { return Color(color).BlendColor(Color(overlayColor)).GetValue(); @@ -3084,43 +3120,6 @@ VectorStringHandle FFIGetResourceVectorString(NativeResourceObject obj) return result; } -void FFIOHOSAceFrameworkSetCursor(int32_t pointerStyle) -{ - auto pipelineContext = PipelineContext::GetCurrentContext(); - if (!pipelineContext) { - LOGE("pipeline context is non-valid"); - return; - } - if (!pipelineContext->GetTaskExecutor()) { - LOGE("TaskExecutor is non-valid"); - return; - } - pipelineContext->GetTaskExecutor()->PostSyncTask( - [pipelineContext, pointerStyle]() { pipelineContext->SetCursor(pointerStyle); }, TaskExecutor::TaskType::UI, - "ArkUICjSetCursor"); -} - -void FFIOHOSAceFrameworkRestoreDefault() -{ - auto pipelineContext = PipelineContext::GetCurrentContext(); - if (!pipelineContext) { - LOGE("pipeline context is non-valid"); - return; - } - if (!pipelineContext->GetTaskExecutor()) { - LOGE("TaskExecutor is non-valid"); - return; - } - pipelineContext->GetTaskExecutor()->PostSyncTask( - [pipelineContext]() { pipelineContext->RestoreDefault(0, MouseStyleChangeReason::USER_SET_MOUSESTYLE); }, - TaskExecutor::TaskType::UI, "ArkUICjRestoreDefault"); -} - -void FFIOHOSAceFrameworkMonopolizeEvents(bool monopolize) -{ - ViewAbstractModel::GetInstance()->SetMonopolizeEvents(monopolize); -} - void FfiOHOSAceFrameworkViewAbstractSetDraggable(bool value) { ViewAbstractModel::GetInstance()->SetDraggable(value); diff --git a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_view_abstract_ffi.h b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_view_abstract_ffi.h index 41e17d8c27dcb11890509fbe1d9ffac1b6ad5a1e..71e6711401fd21ac8947a952e44f58d5631041f6 100644 --- a/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_view_abstract_ffi.h +++ b/frameworks/bridge/cj_frontend/interfaces/cj_ffi/cj_view_abstract_ffi.h @@ -629,8 +629,8 @@ CJ_EXPORT void FfiOHOSAceFrameworkViewAbstractSetSharedTransition(char* shareId, CJ_EXPORT void FfiOHOSAceFrameworkViewAbstractSetGeometryTransition(char* id, CJGeometryTransitionOptions option); CJ_EXPORT void FfiOHOSAceFrameworkViewAbstractSetBlur(double value); CJ_EXPORT void FfiOHOSAceFrameworkViewAbstractSetColorBlend(uint32_t color); -CJ_EXPORT void FfiOHOSAceFrameworkViewAbstractSetLinearGradientBlur( - double radius, int32_t direction, VectorFloat64Ptr blurVec, VectorFloat64Ptr positionVec); +CJ_EXPORT void FfiOHOSAceFrameworkViewAbstractSetLinearGradientBlur(double radius, int32_t direction, + VectorFloat64Ptr blurVec, VectorFloat64Ptr positionVec); CJ_EXPORT void FfiOHOSAceFrameworkViewAbstractSetBackdropBlur(double value); CJ_EXPORT void FfiOHOSAceFrameworkViewAbstractSetWindowBlur(float progress, int32_t styleValue); CJ_EXPORT void FfiOHOSAceFrameworkViewAbstractSetShadow(double radius, uint32_t color, double offsetX, double offsetY); @@ -785,6 +785,10 @@ CJ_EXPORT void FFIOHOSAceFrameworkFocusScopePriority(const char* scopeId, int32_ CJ_EXPORT void FFIOHOSAceFrameworkFocusScopeId(const char* id, bool isGroup, bool arrowStepOut); CJ_EXPORT uint32_t FFIOHOSAceFrameworkBlendColor(uint32_t color, uint32_t overlayColor); +CJ_EXPORT void FFIOHOSAceFrameworkSetCursor(int32_t pointerStyle); +CJ_EXPORT void FFIOHOSAceFrameworkRestoreDefault(); +CJ_EXPORT void FFIOHOSAceFrameworkMonopolizeEvents(bool monopolize); + CJ_EXPORT void FFISetWidthWithEmpty(); CJ_EXPORT void FFISetHeightWithEmpty(); @@ -830,9 +834,6 @@ CJ_EXPORT uint32_t FFIGetResourceUInt32(NativeResourceObject obj); CJ_EXPORT bool FFIGetResourceBool(NativeResourceObject obj); CJ_EXPORT VectorUInt32Handle FFIGetResourceVectorUInt32(NativeResourceObject obj); CJ_EXPORT VectorStringHandle FFIGetResourceVectorString(NativeResourceObject obj); -CJ_EXPORT void FFIOHOSAceFrameworkSetCursor(int32_t pointerStyle); -CJ_EXPORT void FFIOHOSAceFrameworkRestoreDefault(); -CJ_EXPORT void FFIOHOSAceFrameworkMonopolizeEvents(bool monopolize); CJ_EXPORT void FfiOHOSAceFrameworkPopupDismiss(); struct CBorderImageOption {