openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-10-07 08:24:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!32474 修复capi textInput contentType枚举值

Browse Source 
Merge pull request !32474 from honzx/0509contentTyp2
This commit is contained in:
openharmony_ci 2024-05-10 07:31:17 +00:00 committed by Gitee
commit 7818a1743e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,6 +206,7 @@ constexpr int32_t OUTLINE_LEFT_WIDTH_INDEX = 0;
constexpr int32_t OUTLINE_TOP_WIDTH_INDEX = 1; constexpr int32_t OUTLINE_TOP_WIDTH_INDEX = 1;
constexpr int32_t OUTLINE_RIGHT_WIDTH_INDEX = 2; constexpr int32_t OUTLINE_RIGHT_WIDTH_INDEX = 2;
constexpr int32_t OUTLINE_BOTTOM_WIDTH_INDEX = 3; constexpr int32_t OUTLINE_BOTTOM_WIDTH_INDEX = 3;
constexpr uint32_t CONVERT_CONTENT_TYPE = 5;
const std::string EMPTY_STR = ""; const std::string EMPTY_STR = "";
const std::vector<std::string> ACCESSIBILITY_LEVEL_VECTOR = { "auto", "yes", "no", "no-hide-descendants" }; const std::vector<std::string> ACCESSIBILITY_LEVEL_VECTOR = { "auto", "yes", "no", "no-hide-descendants" };
std::map<std::string, int32_t> ACCESSIBILITY_LEVEL_MAP = { { "auto", 0 }, { "yes", 1 }, { "no", 2 }, std::map<std::string, int32_t> ACCESSIBILITY_LEVEL_MAP = { { "auto", 0 }, { "yes", 1 }, { "no", 2 },
@ -4042,16 +4043,27 @@ int32_t SetTextInputContentType(ArkUI_NodeHandle node, const ArkUI_AttributeItem
if (actualSize < 0) { if (actualSize < 0) {
return ERROR_CODE_PARAM_INVALID; return ERROR_CODE_PARAM_INVALID;
} }
// The enum values of native_type.h are different from those of text_content_type.h. Convert the enum values.
auto value = static_cast<uint32_t>(item->value[0].i32);
if (value >= static_cast<uint32_t>(ARKUI_TEXTINPUT_CONTENT_TYPE_NICKNAME)
&& value <= static_cast<uint32_t>(ARKUI_TEXTINPUT_CONTENT_TYPE_FORMAT_ADDRESS)) {
value += CONVERT_CONTENT_TYPE;
}
fullImpl->getNodeModifiers()->getTextInputModifier()->setTextInputContentType( fullImpl->getNodeModifiers()->getTextInputModifier()->setTextInputContentType(
node->uiNodeHandle, static_cast<uint32_t>(item->value[0].i32)); node->uiNodeHandle, value);
return ERROR_CODE_NO_ERROR; return ERROR_CODE_NO_ERROR;
} }
const ArkUI_AttributeItem* GetTextInputContentType(ArkUI_NodeHandle node) const ArkUI_AttributeItem* GetTextInputContentType(ArkUI_NodeHandle node)
{ {
auto fullImpl = GetFullImpl(); auto fullImpl = GetFullImpl();
g_numberValues[0].i32 = fullImpl->getNodeModifiers()->getTextInputModifier()->getTextInputContentType( auto value = fullImpl->getNodeModifiers()->getTextInputModifier()->getTextInputContentType(
node->uiNodeHandle); node->uiNodeHandle);
if (value >= static_cast<uint32_t>(ARKUI_TEXTINPUT_CONTENT_TYPE_FORMAT_ADDRESS) + CONVERT_CONTENT_TYPE
&& value <= static_cast<uint32_t>(ARKUI_TEXTINPUT_CONTENT_TYPE_FORMAT_ADDRESS) + CONVERT_CONTENT_TYPE) {
value -= CONVERT_CONTENT_TYPE;
}
g_numberValues[0].i32 = value;
g_attributeItem.size = REQUIRED_ONE_PARAM; g_attributeItem.size = REQUIRED_ONE_PARAM;
return &g_attributeItem; return &g_attributeItem;
} }