mirror of
https://gitee.com/openharmony/arkui_ace_engine
synced 2024-11-23 07:01:24 +00:00
Description:修复ImageSpan的capi错误和无障碍下显示密码时不播报密码 Sig: SIG_ApplicationFramework Feature or Bugfix:Bugfix Binary Source:No TDD:(评估不涉及) XTS:Pass 预测试:(Pass/Fail/评估不涉及) Signed-off-by:guanzengkun <guanzengkun@huawei.com>
This commit is contained in:
parent
5abbd932d2
commit
6c78cd3656
@ -34,7 +34,11 @@ bool TextFieldAccessibilityProperty::IsPassword() const
|
||||
CHECK_NULL_RETURN(frameNode, false);
|
||||
auto textFieldPattern = frameNode->GetPattern<TextFieldPattern>();
|
||||
CHECK_NULL_RETURN(textFieldPattern, false);
|
||||
return textFieldPattern->IsInPasswordMode();
|
||||
CHECK_NULL_RETURN(textFieldPattern->IsInPasswordMode(), false);
|
||||
auto responseArea = textFieldPattern->GetResponseArea();
|
||||
auto passwordArea = AceType::DynamicCast<PasswordResponseArea>(responseArea);
|
||||
CHECK_NULL_RETURN(passwordArea, false);
|
||||
return passwordArea->IsObscured();
|
||||
}
|
||||
|
||||
AceTextCategory TextFieldAccessibilityProperty::GetTextInputType() const
|
||||
|
@ -748,11 +748,7 @@ void SetBorderRadius(ArkUINodeHandle node, const ArkUI_Float32* values, const Ar
|
||||
borderRadius.radiusBottomLeft = Dimension(values[NUM_2], static_cast<OHOS::Ace::DimensionUnit>(units[NUM_2]));
|
||||
borderRadius.radiusBottomRight = Dimension(values[NUM_3], static_cast<OHOS::Ace::DimensionUnit>(units[NUM_3]));
|
||||
borderRadius.multiValued = true;
|
||||
if (frameNode->GetTag() == V2::IMAGE_SPAN_ETS_TAG) {
|
||||
ImageSpanView::SetBorderRadius(frameNode, borderRadius);
|
||||
} else {
|
||||
ViewAbstract::SetBorderRadius(frameNode, borderRadius);
|
||||
}
|
||||
ViewAbstract::SetBorderRadius(frameNode, borderRadius);
|
||||
}
|
||||
|
||||
void ResetBorderRadius(ArkUINodeHandle node)
|
||||
@ -760,11 +756,7 @@ void ResetBorderRadius(ArkUINodeHandle node)
|
||||
auto* frameNode = reinterpret_cast<FrameNode*>(node);
|
||||
CHECK_NULL_VOID(frameNode);
|
||||
OHOS::Ace::CalcDimension reset;
|
||||
if (frameNode->GetTag() == V2::IMAGE_SPAN_ETS_TAG) {
|
||||
ImageSpanView::ResetBorderRadius(frameNode);
|
||||
} else {
|
||||
ViewAbstract::SetBorderRadius(frameNode, reset);
|
||||
}
|
||||
ViewAbstract::SetBorderRadius(frameNode, reset);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -1525,6 +1525,9 @@ int32_t SetBorderRadius(ArkUI_NodeHandle node, const ArkUI_AttributeItem* item)
|
||||
} else if (node->type == ARKUI_NODE_TEXT_INPUT || node->type == ARKUI_NODE_TEXT_AREA) {
|
||||
fullImpl->getNodeModifiers()->getTextAreaModifier()->setTextAreaBorderRadius(
|
||||
node->uiNodeHandle, radiusVals, radiusUnits, ALLOW_SIZE_4);
|
||||
} else if (node->type == ARKUI_NODE_IMAGE_SPAN) {
|
||||
fullImpl->getNodeModifiers()->getImageSpanModifier()->setImageSpanBorderRadius(
|
||||
node->uiNodeHandle, radiusVals, radiusUnits, ALLOW_SIZE_4);
|
||||
} else {
|
||||
fullImpl->getNodeModifiers()->getCommonModifier()->setBorderRadius(
|
||||
node->uiNodeHandle, radiusVals, radiusUnits, ALLOW_SIZE_4);
|
||||
@ -1539,6 +1542,8 @@ void ResetBorderRadius(ArkUI_NodeHandle node)
|
||||
fullImpl->getNodeModifiers()->getImageModifier()->resetImageBorderRadius(node->uiNodeHandle);
|
||||
} else if (node->type == ARKUI_NODE_TEXT_INPUT || node->type == ARKUI_NODE_TEXT_AREA) {
|
||||
fullImpl->getNodeModifiers()->getTextAreaModifier()->resetTextAreaBorderRadius(node->uiNodeHandle);
|
||||
} else if (node->type == ARKUI_NODE_IMAGE_SPAN) {
|
||||
fullImpl->getNodeModifiers()->getImageSpanModifier()->resetImageSpanBorderRadius(node->uiNodeHandle);
|
||||
} else {
|
||||
fullImpl->getNodeModifiers()->getCommonModifier()->resetBorderRadius(node->uiNodeHandle);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user