From d52047449bad4386ed6c1cc38e3c2a0486f4772b Mon Sep 17 00:00:00 2001 From: aryawang Date: Sun, 28 Apr 2024 02:41:21 +0000 Subject: [PATCH 1/2] NDK-Capi Signed-off-by: aryawang Change-Id: I19528f035945aad3d46e7e0938b1da112aad9ffb --- arkui/ace_engine/native/native_node.h | 90 +++++++++++++++++++++++++-- arkui/ace_engine/native/native_type.h | 20 +++++- 2 files changed, 104 insertions(+), 6 deletions(-) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 033cbf568..678479a4f 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -1369,7 +1369,48 @@ typedef enum { * */ NODE_ASPECT_RATIO, - + /** + * @brief Defines the weight of the component within its row, column, or flex container for proportional + * distribution of available space within the container. + * This attribute can be set, reset, and obtained as required through APIs. + * + * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n + * .value[0].u32: weight of the component along the main axis. \n + * \n + * Format of the return value {@link ArkUI_AttributeItem}:\n + * .value[0].u32: weight of the component along the main axis. \n + * + */ + NODE_LAYOUT_WEIGHT, + /** + * @brief Sets the display priority for the component in the row, column, or flex (single-line) container. + * This attribute can be set, reset, and obtained as required through APIs. + * + * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n + * .value[0].u32: display priority of the component in the container. \n + * \n + * Format of the return value {@link ArkUI_AttributeItem}:\n + * .value[0].u32: display priority of the component in the container. \n + * + */ + NODE_DISPLAY_PRIORITY, + /** + * @brief Sets the thickness of an element's outline. + * + * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n + * .value[0].f32: thickness of the left outline. \n + * .value[1].f32: thickness of the top outline. \n + * .value[2].f32: thickness of the right outline. \n + * .value[3].f32: thickness of the bottom outline. \n + * \n + * Format of the return value {@link ArkUI_AttributeItem}:\n + * .value[0].f32: thickness of the left outline. \n + * .value[1].f32: thickness of the top outline. \n + * .value[2].f32: thickness of the right outline. \n + * .value[3].f32: thickness of the bottom outline. \n + * + */ + NODE_OUTLINE_WIDTH, /** * @brief Defines the text content attribute, which can be set, reset, and obtained as required through APIs. * @@ -1441,13 +1482,15 @@ typedef enum { * This attribute can be set, reset, and obtained as required through APIs. * * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: text decoration style {@link ArkUI_TextDecorationType}. + * .value[0].i32: text decoration type {@link ArkUI_TextDecorationType}. * The default value is ARKUI_TEXT_DECORATION_TYPE_NONE.\n * .value[1]?.u32: text decoration color, in 0xARGB format. For example, 0xFFFF0000 indicates red. Optional.\n + * .value[2]?.i32: text decoration style {@link ArkUI_TextDecorationStyle}. \n * \n * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].i32: text decoration style {@link ArkUI_TextDecorationType}.\n + * .value[0].i32: text decoration type {@link ArkUI_TextDecorationType}.\n * .value[1].u32: text decoration color, in 0xARGB format. \n + * .value[2].i32: text decoration style {@link ArkUI_TextDecorationStyle}. \n * */ NODE_TEXT_DECORATION, @@ -1787,6 +1830,23 @@ typedef enum { * */ NODE_IMAGE_COLOR_FILTER, + /** + * @brief Sets the resizable image options. + * + * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n + * .value[0].f32: width of the left edge. The unit is vp. \n + * .value[1].f32: width of the top edge. The unit is vp. \n + * .value[2].f32: width of the right edge. The unit is vp. \n + * .value[3].f32: width of the bottom edge. The unit is vp. \n + * \n + * Format of the return value {@link ArkUI_AttributeItem}:\n + * .value[0].f32: width of the left edge. The unit is vp. \n + * .value[1].f32: width of the top edge. The unit is vp. \n + * .value[2].f32: width of the right edge. The unit is vp. \n + * .value[3].f32: width of the bottom edge. The unit is vp. \n + * + */ + NODE_IMAGE_RESIZABLE, /** * @brief Defines the auto resize attribute, which can be set, reset, and obtained as required through APIs. * @@ -2112,7 +2172,17 @@ typedef enum { * */ NODE_TEXT_INPUT_TEXT_SELECTION, - + /** + * @brief Sets whether the text box loses focus after the Enter key is pressed to submit information. + * + * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n + * .value[0].i32: whether the text box loses focus. \n + * \n + * Format of the return value {@link ArkUI_AttributeItem}:\n + * .value[0].i32: whether the text box loses focus. \n + * + */ + NODE_TEXT_INPUT_BLUR_ON_SUBMIT, /** * @brief Defines the default placeholder text for the multi-line text box. * This attribute can be set, reset, and obtained as required through APIs. @@ -2237,7 +2307,17 @@ typedef enum { * */ NODE_TEXT_AREA_SHOW_COUNTER, - + /** + * @brief Sets whether the multi-line text box loses focus after the Enter key is pressed to submit information. + * + * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n + * .value[0].i32: whether the text box loses focus. \n + * \n + * Format of the return value {@link ArkUI_AttributeItem}:\n + * .value[0].i32: whether the text box loses focus. \n + * + */ + NODE_TEXT_AREA_BLUR_ON_SUBMIT, /** * @brief Defines the button text content. This attribute can be set, reset, and obtained as required through APIs. * diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index f9038b369..308aab409 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -358,7 +358,7 @@ typedef enum { }ArkUI_ProgressType; /** - * @brief Enumerates the text decoration styles. + * @brief Enumerates the text decoration types. * * @since 12 */ @@ -373,6 +373,24 @@ typedef enum { ARKUI_TEXT_DECORATION_TYPE_LINE_THROUGH, } ArkUI_TextDecorationType; +/** + * @brief Enumerates the text decoration styles. + * + * @since 12 + */ +typedef enum { + /** Single solid line. */ + ARKUI_TEXT_DECORATION_STYLE_SOLID = 0, + /** Double solid line. */ + ARKUI_TEXT_DECORATION_STYLE_DOUBLE, + /** Dotted line. */ + ARKUI_TEXT_DECORATION_STYLE_DOTTED, + /** Dashed line. */ + ARKUI_TEXT_DECORATION_STYLE_DASHED, + /** Wavy line. */ + ARKUI_TEXT_DECORATION_STYLE_WAVY, +} ArkUI_TextDecorationStyle; + /** * @brief Enumerates the text cases. * -- Gitee From c687fa9cf4cb376e05ecd4194c4ed63e6d64ed06 Mon Sep 17 00:00:00 2001 From: aryawang Date: Wed, 8 May 2024 02:35:59 +0000 Subject: [PATCH 2/2] =?UTF-8?q?NDK=20C-Api=20Image=20resizable=20=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: aryawang Change-Id: Ibe1c273daf38c2815bffaedc23c5d439c62b0d91 --- arkui/ace_engine/native/native_node.h | 34 +++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index 678479a4f..3be947357 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -1830,23 +1830,6 @@ typedef enum { * */ NODE_IMAGE_COLOR_FILTER, - /** - * @brief Sets the resizable image options. - * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].f32: width of the left edge. The unit is vp. \n - * .value[1].f32: width of the top edge. The unit is vp. \n - * .value[2].f32: width of the right edge. The unit is vp. \n - * .value[3].f32: width of the bottom edge. The unit is vp. \n - * \n - * Format of the return value {@link ArkUI_AttributeItem}:\n - * .value[0].f32: width of the left edge. The unit is vp. \n - * .value[1].f32: width of the top edge. The unit is vp. \n - * .value[2].f32: width of the right edge. The unit is vp. \n - * .value[3].f32: width of the bottom edge. The unit is vp. \n - * - */ - NODE_IMAGE_RESIZABLE, /** * @brief Defines the auto resize attribute, which can be set, reset, and obtained as required through APIs. * @@ -1893,6 +1876,23 @@ typedef enum { * */ NODE_IMAGE_RENDER_MODE, + /** + * @brief Sets the resizable image options. + * + * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n + * .value[0].f32: width of the left edge. The unit is vp. \n + * .value[1].f32: width of the top edge. The unit is vp. \n + * .value[2].f32: width of the right edge. The unit is vp. \n + * .value[3].f32: width of the bottom edge. The unit is vp. \n + * \n + * Format of the return value {@link ArkUI_AttributeItem}:\n + * .value[0].f32: width of the left edge. The unit is vp. \n + * .value[1].f32: width of the top edge. The unit is vp. \n + * .value[2].f32: width of the right edge. The unit is vp. \n + * .value[3].f32: width of the bottom edge. The unit is vp. \n + * + */ + NODE_IMAGE_RESIZABLE, /** * @brief Defines the color of the component when it is selected. * This attribute can be set, reset, and obtained as required through APIs. -- Gitee