openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 17:21:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

【NDK】CAPI get接口问题修改汇总

Browse Source 
Signed-off-by: yyuanche <yuancheng25@huawei.com>

Change-Id: I42ea99dbcc43743d2f812aea02b50465c60e9fd0
This commit is contained in:
y30043833 2024-05-21 10:01:25 +00:00
parent 3c34c550da
commit 53efe761d9
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frameworks/core/components_ng/base/view_abstract.cpp
View File

@ -3628,8 +3628,14 @@ TextDirection ViewAbstract::GetDirection(FrameNode* frameNode)
FlexAlign ViewAbstract::GetAlignSelf(FrameNode* frameNode)
{
FlexAlign value = FlexAlign::AUTO;
const auto& flexItemProperty = frameNode->GetLayoutProperty()->GetFlexItemProperty();
return flexItemProperty->GetAlignSelf().value_or(FlexAlign::AUTO);
CHECK_NULL_RETURN(flexItemProperty, value);
auto getValue = flexItemProperty->GetAlignSelf();
if (getValue.has_value()) {
return getValue.value();
}
return value;
}
float ViewAbstract::GetFlexGrow(FrameNode* frameNode)

2
frameworks/core/components_ng/pattern/swiper/swiper_model_ng.cpp
View File

@ -656,7 +656,7 @@ int SwiperModelNG::GetIndex(FrameNode* frameNode)
Axis SwiperModelNG::GetDirection(FrameNode* frameNode)
{
Axis value = Axis::VERTICAL;
Axis value = Axis::HORIZONTAL;
ACE_GET_NODE_LAYOUT_PROPERTY_WITH_DEFAULT_VALUE(SwiperLayoutProperty, Direction, value, frameNode, value);
return value;
}

26
interfaces/native/node/style_modifier.cpp
View File

@ -270,43 +270,43 @@ std::string CurveToString(int curve)
std::string curveStr = "linear";
switch (curve) {
case ArkUI_AnimationCurve::ARKUI_CURVE_LINEAR:
curveStr = "Linear";
curveStr = "linear";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_EASE:
curveStr = "Ease";
curveStr = "ease";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_EASE_IN:
curveStr = "EaseIn";
curveStr = "ease-in";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_EASE_OUT:
curveStr = "EaseOut";
curveStr = "ease-out";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_EASE_IN_OUT:
curveStr = "EaseInOut";
curveStr = "ease-in-out";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_FAST_OUT_SLOW_IN:
curveStr = "FastOutSlowIn";
curveStr = "fast-out-slow-in";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_LINEAR_OUT_SLOW_IN:
curveStr = "LinearOutSlowIn";
curveStr = "linear-out-slow-in";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_FAST_OUT_LINEAR_IN:
curveStr = "FastOutLinearIn";
curveStr = "fast-out-linear-in";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_EXTREME_DECELERATION:
curveStr = "ExtremeDeceleration";
curveStr = "extreme-deceleration";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_SHARP:
curveStr = "Sharp";
curveStr = "sharp";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_RHYTHM:
curveStr = "Rhythm";
curveStr = "rhythm";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_SMOOTH:
curveStr = "Smooth";
curveStr = "smooth";
break;
case ArkUI_AnimationCurve::ARKUI_CURVE_FRICTION:
curveStr = "Friction";
curveStr = "friction";
break;
default:
break;