From 2659c653afc97b11b2d24158b87c807dd9dd8b4a Mon Sep 17 00:00:00 2001 From: stella-ren Date: Fri, 11 Mar 2022 12:07:48 +0800 Subject: [PATCH 1/2] move the path of drawing text files Signed-off-by: stella-ren --- .../drawing_font_collection.h | 2 +- .../drawing_text_declaration.h | 0 .../drawing_text_typography.h | 32 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) rename zh-cn/native_sdk/graphic/{ => native_drawing}/drawing_font_collection.h (97%) rename zh-cn/native_sdk/graphic/{ => native_drawing}/drawing_text_declaration.h (100%) rename zh-cn/native_sdk/graphic/{ => native_drawing}/drawing_text_typography.h (94%) diff --git a/zh-cn/native_sdk/graphic/drawing_font_collection.h b/zh-cn/native_sdk/graphic/native_drawing/drawing_font_collection.h similarity index 97% rename from zh-cn/native_sdk/graphic/drawing_font_collection.h rename to zh-cn/native_sdk/graphic/native_drawing/drawing_font_collection.h index 18def869..8093dc43 100644 --- a/zh-cn/native_sdk/graphic/drawing_font_collection.h +++ b/zh-cn/native_sdk/graphic/native_drawing/drawing_font_collection.h @@ -43,7 +43,7 @@ extern "C" { #endif /** - * @brief 创建fontCollection + * @brief 创建OH_Drawing_FontCollection * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing * @return 指向创建的OH_Drawing_FontCollection对象的指针 diff --git a/zh-cn/native_sdk/graphic/drawing_text_declaration.h b/zh-cn/native_sdk/graphic/native_drawing/drawing_text_declaration.h similarity index 100% rename from zh-cn/native_sdk/graphic/drawing_text_declaration.h rename to zh-cn/native_sdk/graphic/native_drawing/drawing_text_declaration.h diff --git a/zh-cn/native_sdk/graphic/drawing_text_typography.h b/zh-cn/native_sdk/graphic/native_drawing/drawing_text_typography.h similarity index 94% rename from zh-cn/native_sdk/graphic/drawing_text_typography.h rename to zh-cn/native_sdk/graphic/native_drawing/drawing_text_typography.h index a7186c73..68555c44 100644 --- a/zh-cn/native_sdk/graphic/drawing_text_typography.h +++ b/zh-cn/native_sdk/graphic/native_drawing/drawing_text_typography.h @@ -82,9 +82,9 @@ enum OH_Drawing_TextAlign { TEXT_ALIGN_START, /** * 当OH_Drawing_TextDirection是TEXT_DIRECTION_LTR时， - * TEXT_ALIGN_START和TEXT_ALIGN_RIGHT相同； + * TEXT_ALIGN_END和TEXT_ALIGN_RIGHT相同； * 类似地，当OH_Drawing_TextDirection是TEXT_DIRECTION_RTL时， - * TEXT_ALIGN_START和TEXT_ALIGN_LEFT相同。 + * TEXT_ALIGN_END和TEXT_ALIGN_LEFT相同。 */ TEXT_ALIGN_END, }; @@ -148,10 +148,10 @@ enum OH_Drawing_FontStyle { }; /** - * @brief 创建TypographyStyle + * @brief 创建OH_Drawing_TypographyStyle * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing - * @return OH_Drawing_TypographyStyle 指向创建的OH_Drawing_TypographyStyle对象的指针 + * @return 指向创建的OH_Drawing_TypographyStyle对象的指针 * @since 8 * @version 1.0 */ @@ -204,7 +204,7 @@ void OH_Drawing_SetTypographyTextMaxLines(OH_Drawing_TypographyStyle*, int /* ma * @brief 创建OH_Drawing_TextStyle * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing - * @return OH_Drawing_TextStyle 指向创建的OH_Drawing_TextStyle对象的指针 + * @return 指向创建的OH_Drawing_TextStyle对象的指针 * @since 8 * @version 1.0 */ @@ -214,7 +214,7 @@ OH_Drawing_TextStyle* OH_Drawing_CreateTextStyle(void); * @brief 释放被OH_Drawing_TextStyle对象占据的内存 * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing - * @param OH_Drawing_TypographyStyle 指向OH_Drawing_TextStyle对象的指针 + * @param OH_Drawing_TextStyle 指向OH_Drawing_TextStyle对象的指针 * @since 8 * @version 1.0 */ @@ -311,7 +311,7 @@ void OH_Drawing_SetTextStyleFontFamilies(OH_Drawing_TextStyle*, int /* fontFamiliesNumber */, const char* fontFamilies[]); /** - * @brief 字体风格 + * @brief 设置字体风格 * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing * @param OH_Drawing_TextStyle 指向OH_Drawing_TextStyle对象的指针 @@ -338,7 +338,7 @@ void OH_Drawing_SetTextStyleLocale(OH_Drawing_TextStyle*, const char*); * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing * @param OH_Drawing_TypographyStyle 指向OH_Drawing_TypographyStyle的指针 * @param OH_Drawing_FontCollection 指向OH_Drawing_FontCollection的指针 - * @return OH_Drawing_TypographyCreate 指向新创建的OH_Drawing_TypographyCreate对象的指针 + * @return 指向新创建的OH_Drawing_TypographyCreate对象的指针 * @since 8 * @version 1.0 */ @@ -391,8 +391,8 @@ void OH_Drawing_TypographyHandlerPop(OH_Drawing_TypographyCreate*); * @brief 创建OH_Drawing_Typography * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing - * @param OH_Drawing_TypographyCreate 指向OH_Drawing_Typography对象的指针 - * @return OH_Drawing_Typography a pointer to OH_Drawing_Typography + * @param OH_Drawing_TypographyCreate 指向OH_Drawing_TypographyCreate对象的指针 + * @return a pointer to OH_Drawing_Typography * @since 8 * @version 1.0 */ @@ -438,7 +438,7 @@ void OH_Drawing_TypographyPaint(OH_Drawing_Typography*, OH_Drawing_Canvas*, * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing * @param OH_Drawing_Typography 指向OH_Drawing_Typography对象的指针 - * @return double 最大宽度 + * @return 最大宽度 * @since 8 * @version 1.0 */ @@ -449,7 +449,7 @@ double OH_Drawing_TypographyGetMaxWidth(OH_Drawing_Typography*); * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing * @param OH_Drawing_Typography 指向OH_Drawing_Typography对象的指针 - * @return double 高度 + * @return 高度 * @since 8 * @version 1.0 */ @@ -460,7 +460,7 @@ double OH_Drawing_TypographyGetHeight(OH_Drawing_Typography*); * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing * @param OH_Drawing_Typography 指向OH_Drawing_Typography对象的指针 - * @return double 最长行 + * @return 最长行 * @since 8 * @version 1.0 */ @@ -471,7 +471,7 @@ double OH_Drawing_TypographyGetLongestLine(OH_Drawing_Typography*); * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing * @param OH_Drawing_Typography 指向OH_Drawing_Typography对象的指针 - * @return double 内部最小宽度 + * @return 内部最小宽度 * @since 8 * @version 1.0 */ @@ -493,7 +493,7 @@ double OH_Drawing_TypographyGetMaxIntrinsicWidth(OH_Drawing_Typography*); * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing * @param OH_Drawing_Typography 指向OH_Drawing_Typography对象的指针 - * @return double 表音文字的基线 + * @return 表音文字的基线 * @since 8 * @version 1.0 */ @@ -504,7 +504,7 @@ double OH_Drawing_TypographyGetAlphabeticBaseline(OH_Drawing_Typography*); * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing * @param OH_Drawing_Typography 指向OH_Drawing_Typography对象的指针 - * @return double 表意文字的基线 + * @return 表意文字的基线 * @since 8 * @version 1.0 */ -- Gitee From 3fe2967c28bdbf5d83b4f16747008ddebdbf0fcd Mon Sep 17 00:00:00 2001 From: stella-ren Date: Fri, 11 Mar 2022 14:22:50 +0800 Subject: [PATCH 2/2] add Signed-off-by: stella-ren --- .../graphic/native_drawing/drawing_text_typography.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh-cn/native_sdk/graphic/native_drawing/drawing_text_typography.h b/zh-cn/native_sdk/graphic/native_drawing/drawing_text_typography.h index 68555c44..b2e32f91 100644 --- a/zh-cn/native_sdk/graphic/native_drawing/drawing_text_typography.h +++ b/zh-cn/native_sdk/graphic/native_drawing/drawing_text_typography.h @@ -319,7 +319,7 @@ void OH_Drawing_SetTextStyleFontFamilies(OH_Drawing_TextStyle*, * @since 8 * @version 1.0 */ -void OH_Drawing_SetTextStyleFontStyle(OH_Drawing_TextStyle*, int /* fontStyle */); +void OH_Drawing_SetTextStyleFontStyle(OH_Drawing_TextStyle*, int /* OH_Drawing_FontStyle */); /** * @brief 设置语言区域 @@ -392,7 +392,7 @@ void OH_Drawing_TypographyHandlerPop(OH_Drawing_TypographyCreate*); * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing * @param OH_Drawing_TypographyCreate 指向OH_Drawing_TypographyCreate对象的指针 - * @return a pointer to OH_Drawing_Typography + * @return 指向OH_Drawing_Typography对象的指针 * @since 8 * @version 1.0 */ @@ -482,7 +482,7 @@ double OH_Drawing_TypographyGetMinIntrinsicWidth(OH_Drawing_Typography*); * * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing * @param OH_Drawing_Typography 指向OH_Drawing_Typography对象的指针 - * @return double 内部最大宽度 + * @return 内部最大宽度 * @since 8 * @version 1.0 */ -- Gitee