diff --git a/graphic/graphic_2d/native_drawing/drawing_font_collection.h b/graphic/graphic_2d/native_drawing/drawing_font_collection.h
index 1400653741da6c66166b64f2e21bae51bf49ca50..e6ac9f49424f699c6c830f9788619ca8093dec78 100644
--- a/graphic/graphic_2d/native_drawing/drawing_font_collection.h
+++ b/graphic/graphic_2d/native_drawing/drawing_font_collection.h
@@ -13,9 +13,6 @@
* limitations under the License.
*/
-#ifndef C_INCLUDE_DRAWING_FONT_COLLECTION_H
-#define C_INCLUDE_DRAWING_FONT_COLLECTION_H
-
/**
* @addtogroup Drawing
* @{
@@ -40,6 +37,9 @@
* @version 1.0
*/
+#ifndef C_INCLUDE_DRAWING_FONT_COLLECTION_H
+#define C_INCLUDE_DRAWING_FONT_COLLECTION_H
+
#include "drawing_text_declaration.h"
#ifdef __cplusplus
@@ -59,31 +59,31 @@ OH_Drawing_FontCollection* OH_Drawing_CreateFontCollection(void);
* @brief Releases the memory occupied by an OH_Drawing_FontCollection object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontCollection Indicates the pointer to an OH_Drawing_FontCollection object.
+ * @param fontCollection Indicates the pointer to an OH_Drawing_FontCollection object.
* @since 8
* @version 1.0
*/
-void OH_Drawing_DestroyFontCollection(OH_Drawing_FontCollection*);
+void OH_Drawing_DestroyFontCollection(OH_Drawing_FontCollection* fontCollection);
/**
* @brief Disable the font collection fallback.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontCollection Indicates the pointer to an OH_Drawing_FontCollection object.
+ * @param fontCollection Indicates the pointer to an OH_Drawing_FontCollection object.
* @since 12
* @version 1.0
*/
-void OH_Drawing_DisableFontCollectionFallback(OH_Drawing_FontCollection*);
+void OH_Drawing_DisableFontCollectionFallback(OH_Drawing_FontCollection* fontCollection);
/**
* @brief Disable the font collection systemfont.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontCollection Indicates the pointer to an OH_Drawing_FontCollection object.
+ * @param fontCollection Indicates the pointer to an OH_Drawing_FontCollection object.
* @since 12
* @version 1.0
*/
-void OH_Drawing_DisableFontCollectionSystemFont(OH_Drawing_FontCollection*);
+void OH_Drawing_DisableFontCollectionSystemFont(OH_Drawing_FontCollection* fontCollection);
/**
* @brief Creates an OH_Drawing_FontCollection object with shared usage between
@@ -100,11 +100,11 @@ OH_Drawing_FontCollection* OH_Drawing_CreateSharedFontCollection(void);
* @brief Clear font caches.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontCollection Indicates the pointer to an OH_Drawing_FontCollection object.
+ * @param fontCollection Indicates the pointer to an OH_Drawing_FontCollection object.
* @since 12
* @version 1.0
*/
-void OH_Drawing_ClearFontCaches(OH_Drawing_FontCollection*);
+void OH_Drawing_ClearFontCaches(OH_Drawing_FontCollection* fontCollection);
/**
* @brief Get the OH_Drawing_FontCollection global instance.
diff --git a/graphic/graphic_2d/native_drawing/drawing_font_mgr.h b/graphic/graphic_2d/native_drawing/drawing_font_mgr.h
index 15b931f80bbde80557e1866ffe3a1978b9ea9b04..04d880558fe972bc3d8806e204175682836bbdc5 100644
--- a/graphic/graphic_2d/native_drawing/drawing_font_mgr.h
+++ b/graphic/graphic_2d/native_drawing/drawing_font_mgr.h
@@ -13,9 +13,6 @@
* limitations under the License.
*/
-#ifndef C_INCLUDE_DRAWING_FONT_MGR_H
-#define C_INCLUDE_DRAWING_FONT_MGR_H
-
/**
* @addtogroup Drawing
* @{
@@ -40,6 +37,9 @@
* @version 1.0
*/
+#ifndef C_INCLUDE_DRAWING_FONT_MGR_H
+#define C_INCLUDE_DRAWING_FONT_MGR_H
+
#include "drawing_types.h"
#include "drawing_text_typography.h"
#include
@@ -62,34 +62,34 @@ OH_Drawing_FontMgr* OH_Drawing_FontMgrCreate(void);
* @brief Releases the memory occupied by an OH_Drawing_FontMgr object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
+ * @param drawingFontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
* @since 12
* @version 1.0
*/
-void OH_Drawing_FontMgrDestroy(OH_Drawing_FontMgr*);
+void OH_Drawing_FontMgrDestroy(OH_Drawing_FontMgr* drawingFontMgr);
/**
* @brief Gets the count of font families.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
+ * @param drawingFontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
* @return Returns the count of font families.
* @since 12
* @version 1.0
*/
-int OH_Drawing_FontMgrGetFamilyCount(OH_Drawing_FontMgr*);
+int OH_Drawing_FontMgrGetFamilyCount(OH_Drawing_FontMgr* drawingFontMgr);
/**
* @brief Gets the font family name by the index.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
+ * @param drawingFontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
* @param index Indicates the index to get the font family name.
* @return Returns the font family name corresponding to the index value.
* @since 12
* @version 1.0
*/
-char* OH_Drawing_FontMgrGetFamilyName(OH_Drawing_FontMgr*, int index);
+char* OH_Drawing_FontMgrGetFamilyName(OH_Drawing_FontMgr* drawingFontMgr, int index);
/**
* @brief Releases the memory occupied by font family name.
@@ -105,57 +105,57 @@ void OH_Drawing_FontMgrDestroyFamilyName(char* familyName);
* @brief Creates an OH_Drawing_FontStyleSet object by OH_Drawing_FontMgr object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
+ * @param drawingFontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
* @param index Indicates the index used to get the font style set object from the font manager object.
* @return Returns the pointer to the OH_Drawing_FontStyleSet object created.
* @since 12
* @version 1.0
*/
-OH_Drawing_FontStyleSet* OH_Drawing_FontMgrCreateFontStyleSet(OH_Drawing_FontMgr*, int index);
+OH_Drawing_FontStyleSet* OH_Drawing_FontMgrCreateFontStyleSet(OH_Drawing_FontMgr* drawingFontMgr, int index);
/**
* @brief Releases the memory occupied by an OH_Drawing_FontStyleSet object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontStyleSet Indicates the pointer to an OH_Drawing_FontStyleSet object.
+ * @param drawingFontStyleSet Indicates the pointer to an OH_Drawing_FontStyleSet object.
* @since 12
* @version 1.0
*/
-void OH_Drawing_FontMgrDestroyFontStyleSet(OH_Drawing_FontStyleSet*);
+void OH_Drawing_FontMgrDestroyFontStyleSet(OH_Drawing_FontStyleSet* drawingFontStyleSet);
/**
* @brief Get the pointer to an OH_Drawing_FontStyleSet object for the given font style set family name.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
+ * @param drawingFontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
* @param familyName Indicates the family name of a font style set to be matched.
* @return Returns the pointer to the OH_Drawing_FontStyleSet object matched.
* @since 12
* @version 1.0
*/
-OH_Drawing_FontStyleSet* OH_Drawing_FontMgrMatchFamily(OH_Drawing_FontMgr*, const char* familyName);
+OH_Drawing_FontStyleSet* OH_Drawing_FontMgrMatchFamily(OH_Drawing_FontMgr* drawingFontMgr, const char* familyName);
/**
* @brief Get the pointer to an OH_Drawing_Typeface object based on the given font style and family name.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
+ * @param drawingFontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
* @param familyName Indicates the family name of a font style set to be matched.
- * @param OH_Drawing_FontStyleStruct Indicates an OH_Drawing_FontStyleStruct object.
+ * @param fontStyle Indicates an OH_Drawing_FontStyleStruct object.
* @return Returns the pointer to the OH_Drawing_Typeface object matched.
* @since 12
* @version 1.0
*/
-OH_Drawing_Typeface* OH_Drawing_FontMgrMatchFamilyStyle(OH_Drawing_FontMgr*,
+OH_Drawing_Typeface* OH_Drawing_FontMgrMatchFamilyStyle(OH_Drawing_FontMgr* drawingFontMgr,
const char* familyName, OH_Drawing_FontStyleStruct fontStyle);
/**
* @brief Get the pointer to an OH_Drawing_Typeface object for the given character.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
+ * @param drawingFontMgr Indicates the pointer to an OH_Drawing_FontMgr object.
* @param familyName Indicates the family name of a font style set to be matched.
- * @param OH_Drawing_FontStyleStruct Indicates an OH_Drawing_FontStyleStruct object.
+ * @param fontStyle Indicates an OH_Drawing_FontStyleStruct object.
* @param bcp47 Indicates an array of languages which indicate the language of character.
* @param bcp47Count Indicates the array size of bcp47.
* @param character Indicates a UTF8 value to be matched.
@@ -163,33 +163,34 @@ OH_Drawing_Typeface* OH_Drawing_FontMgrMatchFamilyStyle(OH_Drawing_FontMgr*,
* @since 12
* @version 1.0
*/
-OH_Drawing_Typeface* OH_Drawing_FontMgrMatchFamilyStyleCharacter(OH_Drawing_FontMgr*, const char* familyName,
- OH_Drawing_FontStyleStruct fontStyle, const char* bcp47[], int bcp47Count, int32_t character);
+OH_Drawing_Typeface* OH_Drawing_FontMgrMatchFamilyStyleCharacter(OH_Drawing_FontMgr* drawingFontMgr,
+ const char* familyName, OH_Drawing_FontStyleStruct fontStyle,
+ const char* bcp47[], int bcp47Count, int32_t character);
/**
* @brief Create a typeface for the given index.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontStyleSet Indicates the pointer to an OH_Drawing_FontStyleSet object.
+ * @param fontStyleSet Indicates the pointer to an OH_Drawing_FontStyleSet object.
* @param index Indicates the index of the typeface in this fontStyleSet.
* @return If successful, return a pointer to OH_Drawing_Typeface object; if failed, return nullptr.
* @since 12
* @version 1.0
*/
-OH_Drawing_Typeface* OH_Drawing_FontStyleSetCreateTypeface(OH_Drawing_FontStyleSet*, int index);
+OH_Drawing_Typeface* OH_Drawing_FontStyleSetCreateTypeface(OH_Drawing_FontStyleSet* fontStyleSet, int index);
/**
* @brief Get font style for the specified typeface.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontStyleSet Indicates the pointer to an OH_Drawing_FontStyleSet object.
+ * @param fontStyleSet Indicates the pointer to an OH_Drawing_FontStyleSet object.
* @param index Indicates the index of the typeface in this fontStyleSet.
* @param styleName Indicates the style name returned.
* @return Return the OH_Drawing_FontStyleStruct structure.
* @since 12
* @version 1.0
*/
-OH_Drawing_FontStyleStruct OH_Drawing_FontStyleSetGetStyle(OH_Drawing_FontStyleSet*, int32_t index,
+OH_Drawing_FontStyleStruct OH_Drawing_FontStyleSetGetStyle(OH_Drawing_FontStyleSet* fontStyleSet, int32_t index,
char** styleName);
/**
@@ -206,25 +207,25 @@ void OH_Drawing_FontStyleSetFreeStyleName(char** styleName);
* @brief Get the closest matching typeface.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontStyleSet Indicates the pointer to an OH_Drawing_FontStyleSet object.
+ * @param fontStyleSet Indicates the pointer to an OH_Drawing_FontStyleSet object.
* @param fontStyleStruct Indicates the OH_Drawing_FontStyleStruct structure.
* @return A pointer to matched OH_Drawing_Typeface.
* @since 12
* @version 1.0
*/
-OH_Drawing_Typeface* OH_Drawing_FontStyleSetMatchStyle(OH_Drawing_FontStyleSet*,
+OH_Drawing_Typeface* OH_Drawing_FontStyleSetMatchStyle(OH_Drawing_FontStyleSet* fontStyleSet,
OH_Drawing_FontStyleStruct fontStyleStruct);
/**
* @brief Get the count of typeface.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontStyleSet Indicates the pointer to an OH_Drawing_FontStyleSet object.
+ * @param fontStyleSet Indicates the pointer to an OH_Drawing_FontStyleSet object.
* @return The count of typeface in this font style set.
* @since 12
* @version 1.0
*/
-int OH_Drawing_FontStyleSetCount(OH_Drawing_FontStyleSet*);
+int OH_Drawing_FontStyleSetCount(OH_Drawing_FontStyleSet* fontStyleSet);
#ifdef __cplusplus
}
diff --git a/graphic/graphic_2d/native_drawing/drawing_register_font.h b/graphic/graphic_2d/native_drawing/drawing_register_font.h
index 02f0e982643031df63aaf239e97472ec009521d8..2ffdbbfec66f1ff8bdee46f3aa5969d7e6aef0ba 100644
--- a/graphic/graphic_2d/native_drawing/drawing_register_font.h
+++ b/graphic/graphic_2d/native_drawing/drawing_register_font.h
@@ -13,9 +13,6 @@
* limitations under the License.
*/
-#ifndef C_INCLUDE_DRAWING_REGISTER_FONT_H
-#define C_INCLUDE_DRAWING_REGISTER_FONT_H
-
/**
* @addtogroup Drawing
* @{
@@ -40,6 +37,9 @@
* @version 1.0
*/
+#ifndef C_INCLUDE_DRAWING_REGISTER_FONT_H
+#define C_INCLUDE_DRAWING_REGISTER_FONT_H
+
#include "drawing_text_declaration.h"
#include "drawing_types.h"
diff --git a/graphic/graphic_2d/native_drawing/drawing_text_blob.h b/graphic/graphic_2d/native_drawing/drawing_text_blob.h
index b5b11d7afb650686acf24bc411d8759215821469..5a0dbdfd6fcd7e2dabb803489953c87d1d24bde6 100644
--- a/graphic/graphic_2d/native_drawing/drawing_text_blob.h
+++ b/graphic/graphic_2d/native_drawing/drawing_text_blob.h
@@ -13,9 +13,6 @@
* limitations under the License.
*/
-#ifndef C_INCLUDE_DRAWING_TEXT_BLOB_H
-#define C_INCLUDE_DRAWING_TEXT_BLOB_H
-
/**
* @addtogroup Drawing
* @{
@@ -40,6 +37,9 @@
* @version 1.0
*/
+#ifndef C_INCLUDE_DRAWING_TEXT_BLOB_H
+#define C_INCLUDE_DRAWING_TEXT_BLOB_H
+
#include "drawing_types.h"
#ifdef __cplusplus
@@ -62,14 +62,14 @@ OH_Drawing_TextBlobBuilder* OH_Drawing_TextBlobBuilderCreate(void);
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param text Indicates the the pointer to text.
* @param byteLength Indicates the text length.
- * @param OH_Drawing_Font Indicates the pointer to an OH_Drawing_Font object.
- * @param OH_Drawing_TextEncoding Indicates the pointer to an OH_Drawing_TextEncoding object.
+ * @param font Indicates the pointer to an OH_Drawing_Font object.
+ * @param textEncoding Indicates the pointer to an OH_Drawing_TextEncoding object.
* @return Returns the pointer to the OH_Drawing_TextBlob object created.
* @since 12
* @version 1.0
*/
OH_Drawing_TextBlob* OH_Drawing_TextBlobCreateFromText(const void* text, size_t byteLength,
- const OH_Drawing_Font*, OH_Drawing_TextEncoding);
+ const OH_Drawing_Font* font, OH_Drawing_TextEncoding textEncoding);
/**
* @brief Creates an OH_Drawing_TextBlob object from pos text.
@@ -77,51 +77,51 @@ OH_Drawing_TextBlob* OH_Drawing_TextBlobCreateFromText(const void* text, size_t
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param text Indicates the the pointer to text.
* @param byteLength Indicates the text length.
- * @param OH_Drawing_Point2D Indicates the pointer to an OH_Drawing_Point2D array object.
- * @param OH_Drawing_Font Indicates the pointer to an OH_Drawing_Font object.
- * @param OH_Drawing_TextEncoding Indicates the pointer to an OH_Drawing_TextEncoding object.
+ * @param point2D Indicates the pointer to an OH_Drawing_Point2D array object.
+ * @param font Indicates the pointer to an OH_Drawing_Font object.
+ * @param textEncoding Indicates the pointer to an OH_Drawing_TextEncoding object.
* @return Returns the pointer to the OH_Drawing_TextBlob object created.
* @since 12
* @version 1.0
*/
OH_Drawing_TextBlob* OH_Drawing_TextBlobCreateFromPosText(const void* text, size_t byteLength,
- OH_Drawing_Point2D*, const OH_Drawing_Font*, OH_Drawing_TextEncoding);
+ OH_Drawing_Point2D* point2D, const OH_Drawing_Font* font, OH_Drawing_TextEncoding textEncoding);
/**
* @brief Creates an OH_Drawing_TextBlob object from pos text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param str Indicates the the pointer to text.
- * @param OH_Drawing_Font Indicates the pointer to an OH_Drawing_Font object.
- * @param OH_Drawing_TextEncoding Indicates the pointer to an OH_Drawing_TextEncoding object.
+ * @param font Indicates the pointer to an OH_Drawing_Font object.
+ * @param textEncoding Indicates the pointer to an OH_Drawing_TextEncoding object.
* @return Returns the pointer to the OH_Drawing_TextBlob object created.
* @since 12
* @version 1.0
*/
OH_Drawing_TextBlob* OH_Drawing_TextBlobCreateFromString(const char* str,
- const OH_Drawing_Font*, OH_Drawing_TextEncoding);
+ const OH_Drawing_Font* font, OH_Drawing_TextEncoding textEncoding);
/**
* @brief Gets the bounds of textblob, assigned to the pointer to an OH_Drawing_Rect object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBlob Indicates the pointer to an OH_Drawing_TextBlob object.
- * @param OH_Drawing_Rect Indicates the pointer to an OH_Drawing_Rect object.
+ * @param textBlob Indicates the pointer to an OH_Drawing_TextBlob object.
+ * @param rect Indicates the pointer to an OH_Drawing_Rect object.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextBlobGetBounds(OH_Drawing_TextBlob*, OH_Drawing_Rect*);
+void OH_Drawing_TextBlobGetBounds(OH_Drawing_TextBlob* textBlob, OH_Drawing_Rect* rect);
/**
* @brief Gets a non-zero value unique among all OH_Drawing_TextBlob objects.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBlob Indicates the pointer to an OH_Drawing_TextBlob object.
+ * @param textBlob Indicates the pointer to an OH_Drawing_TextBlob object.
* @return Returns identifier for the OH_Drawing_TextBlob object.
* @since 12
* @version 1.0
*/
-uint32_t OH_Drawing_TextBlobUniqueID(const OH_Drawing_TextBlob*);
+uint32_t OH_Drawing_TextBlobUniqueID(const OH_Drawing_TextBlob* textBlob);
/**
* @brief Defines a run, supplies storage for glyphs and positions.
@@ -145,46 +145,46 @@ typedef struct {
* by the caller and is forbidden to be used after OH_Drawing_TextBlobBuilderMake is called.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBlobBuilder Indicates the pointer to an OH_Drawing_TextBlobBuilder object.
- * @param OH_Drawing_Font Indicates the pointer to an OH_Drawing_Font object.
+ * @param textBlobBuilder Indicates the pointer to an OH_Drawing_TextBlobBuilder object.
+ * @param font Indicates the pointer to an OH_Drawing_Font object.
* @param count Indicates the number of glyphs.
- * @param OH_Drawing_Rect Indicates the optional run bounding box.
+ * @param rect Indicates the optional run bounding box.
* @since 11
* @version 1.0
*/
-const OH_Drawing_RunBuffer* OH_Drawing_TextBlobBuilderAllocRunPos(OH_Drawing_TextBlobBuilder*, const OH_Drawing_Font*,
- int32_t count, const OH_Drawing_Rect*);
+const OH_Drawing_RunBuffer* OH_Drawing_TextBlobBuilderAllocRunPos(OH_Drawing_TextBlobBuilder* textBlobBuilder,
+ const OH_Drawing_Font* font, int32_t count, const OH_Drawing_Rect* rect);
/**
* @brief Make an OH_Drawing_TextBlob from OH_Drawing_TextBlobBuilder.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBlobBuilder Indicates the pointer to an OH_Drawing_TextBlobBuilder object.
+ * @param textBlobBuilder Indicates the pointer to an OH_Drawing_TextBlobBuilder object.
* @return Returns the pointer to the OH_Drawing_TextBlob object.
* @since 11
* @version 1.0
*/
-OH_Drawing_TextBlob* OH_Drawing_TextBlobBuilderMake(OH_Drawing_TextBlobBuilder*);
+OH_Drawing_TextBlob* OH_Drawing_TextBlobBuilderMake(OH_Drawing_TextBlobBuilder* textBlobBuilder);
/**
* @brief Destroys an OH_Drawing_TextBlob object and reclaims the memory occupied by the object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBlob Indicates the pointer to an OH_Drawing_TextBlob object.
+ * @param textBlob Indicates the pointer to an OH_Drawing_TextBlob object.
* @since 11
* @version 1.0
*/
-void OH_Drawing_TextBlobDestroy(OH_Drawing_TextBlob*);
+void OH_Drawing_TextBlobDestroy(OH_Drawing_TextBlob* textBlob);
/**
* @brief Destroys an OH_Drawing_TextBlobBuilder object and reclaims the memory occupied by the object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBlobBuilder Indicates the pointer to an OH_Drawing_TextBlobBuilder object.
+ * @param textBlobBuilder Indicates the pointer to an OH_Drawing_TextBlobBuilder object.
* @since 11
* @version 1.0
*/
-void OH_Drawing_TextBlobBuilderDestroy(OH_Drawing_TextBlobBuilder*);
+void OH_Drawing_TextBlobBuilderDestroy(OH_Drawing_TextBlobBuilder* textBlobBuilder);
#ifdef __cplusplus
}
diff --git a/graphic/graphic_2d/native_drawing/drawing_text_declaration.h b/graphic/graphic_2d/native_drawing/drawing_text_declaration.h
index 9a324c807a683863d649a9e7bc6ec5139a59f919..505001519257ebdf97726bc6179cdf39e4b50a4f 100644
--- a/graphic/graphic_2d/native_drawing/drawing_text_declaration.h
+++ b/graphic/graphic_2d/native_drawing/drawing_text_declaration.h
@@ -13,9 +13,6 @@
* limitations under the License.
*/
-#ifndef C_INCLUDE_DRAWING_TEXT_DECLARATION_H
-#define C_INCLUDE_DRAWING_TEXT_DECLARATION_H
-
/**
* @addtogroup Drawing
* @{
@@ -40,6 +37,9 @@
* @version 1.0
*/
+#ifndef C_INCLUDE_DRAWING_TEXT_DECLARATION_H
+#define C_INCLUDE_DRAWING_TEXT_DECLARATION_H
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -60,6 +60,14 @@ typedef struct OH_Drawing_FontCollection OH_Drawing_FontCollection;
*/
typedef struct OH_Drawing_Typography OH_Drawing_Typography;
+/**
+ * @brief Defines an OH_Drawing_LineTypography, which is used to perform line layout.
+ *
+ * @since 14
+ * @version 1.0
+ */
+typedef struct OH_Drawing_LineTypography OH_Drawing_LineTypography;
+
/**
* @brief Defines an OH_Drawing_TextStyle, which is used to manage text colors and decorations.
*
@@ -125,6 +133,30 @@ typedef struct OH_Drawing_FontParser OH_Drawing_FontParser;
*/
typedef struct OH_Drawing_TextShadow OH_Drawing_TextShadow;
+/**
+ * @brief Defines an OH_Drawing_TextTab, which is used to to store the tab alignment type and position.
+ *
+ * @since 14
+ * @version 1.0
+ */
+typedef struct OH_Drawing_TextTab OH_Drawing_TextTab;
+
+/**
+ * @brief Defines an OH_Drawing_TextLine, which is used to manage text line.
+ *
+ * @since 14
+ * @version 1.0
+ */
+typedef struct OH_Drawing_TextLine OH_Drawing_TextLine;
+
+/**
+ * @brief Defines an OH_Drawing_Run, which is used to manage run.
+ *
+ * @since 14
+ * @version 1.0
+ */
+typedef struct OH_Drawing_Run OH_Drawing_Run;
+
#ifdef __cplusplus
}
#endif
diff --git a/graphic/graphic_2d/native_drawing/drawing_text_font_descriptor.h b/graphic/graphic_2d/native_drawing/drawing_text_font_descriptor.h
index d6472d65ac0af4df8fbc12552e57eceeb68c5870..2ae193b582e14ce2fc9d12b200844ff0a5aec7b5 100644
--- a/graphic/graphic_2d/native_drawing/drawing_text_font_descriptor.h
+++ b/graphic/graphic_2d/native_drawing/drawing_text_font_descriptor.h
@@ -62,6 +62,34 @@ typedef enum {
INSTALLED = 1 << 3,
} OH_Drawing_SystemFontType;
+/**
+ * @brief Obtain all system font descriptive symbols that match the specified font descriptor. Where the 'path'
+ * fields are not considered as valid matching values, It takes effect when the remaining fields are not
+ * default values, If all the fields of the parameters OH_Drawing_FontDescriptor are default, obtain all system
+ * font descriptors. If the match fails, return nullptr.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param desc The pointer to the OH_Drawing_FontDescriptor object. It is recommended to
+ * use OH_Drawing_CreateFontDescriptor to obtain a valid OH_Drawing_FontDescriptor instance.
+ * If you create your own OH_Drawing_FontDescriptor object, ensure that fields not intended for matching are
+ * set to their default values.
+ * @param num Indicates the count of obtained OH_Drawing_FontDescriptor.
+ * @return Returns an array of OH_Drawing_FontDescriptor. Released through the
+ * OH_Drawing_DestroyFontDescriptors interface after use.
+ * @since 14
+ */
+OH_Drawing_FontDescriptor* OH_Drawing_MatchFontDescriptors(OH_Drawing_FontDescriptor* desc, size_t* num);
+
+/**
+ * @brief Releases the OH_Drawing_FontDescriptor array.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param descriptors OH_Drawing_FontDescriptor object array.
+ * @param num Represents the number of members of the OH_Drawing_FontDescriptor array.
+ * @since 14
+ */
+void OH_Drawing_DestroyFontDescriptors(OH_Drawing_FontDescriptor* descriptors, size_t num);
+
/**
* @brief Get the OH_Drawing_FontDescriptor object by the font full name and the font type, supporting generic
* fonts, stylish fonts, and installed fonts.
@@ -73,7 +101,7 @@ typedef enum {
* @since 14
*/
OH_Drawing_FontDescriptor* OH_Drawing_GetFontDescriptorByFullName(const OH_Drawing_String* fullName,
- OH_Drawing_SystemFontType fontType);
+ OH_Drawing_SystemFontType fontType);
/**
* @brief Obtain the corresponding font full name array by the font type.
diff --git a/graphic/graphic_2d/native_drawing/drawing_text_line.h b/graphic/graphic_2d/native_drawing/drawing_text_line.h
new file mode 100644
index 0000000000000000000000000000000000000000..2562511466ec484c72571cb2c9471aad71a5592d
--- /dev/null
+++ b/graphic/graphic_2d/native_drawing/drawing_text_line.h
@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @addtogroup Drawing
+ * @{
+ *
+ * @brief Provides the 2D drawing capability.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ *
+ * @since 14
+ * @version 1.0
+ */
+
+/**
+ * @file drawing_text_line.h
+ *
+ * @brief Declares functions related to textLine in the drawing module.
+ *
+ * @kit ArkGraphics2D
+ * @library libnative_drawing.so
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @since 14
+ * @version 1.0
+ */
+
+#ifndef C_INCLUDE_DRAWING_TEXT_LINE_H
+#define C_INCLUDE_DRAWING_TEXT_LINE_H
+
+#include "drawing_text_declaration.h"
+#include "drawing_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Get text line information.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param typography Indicates the pointer to a typography object OH_Drawing_Typography.
+ * @return Indicates the pointer to a text line array object OH_Drawing_Array.
+ * @since 14
+ */
+OH_Drawing_Array* OH_Drawing_TypographyGetTextLines(OH_Drawing_Typography* typography);
+
+/**
+ * @brief Releases the memory occupied by the text line array object OH_Drawing_Array.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param lines Indicates the pointer to the text line array object OH_Drawing_Array.
+ * @since 14
+ * @version 1.0
+ */
+void OH_Drawing_DestroyTextLines(OH_Drawing_Array* lines);
+
+/**
+ * @brief Releases the memory occupied by the text line object OH_Drawing_TextLine.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to the text line object OH_Drawing_TextLine.
+ * @since 14
+ * @version 1.0
+ */
+void OH_Drawing_DestroyTextLine(OH_Drawing_TextLine* line);
+
+/**
+ * @brief Get the text line object by index.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param lines Indicates the pointer to the text line array object OH_Drawing_Array.
+ * @param index The text line object index.
+ * @return Indicates the pointer to a text line object OH_Drawing_TextLine.
+ * @since 14
+ */
+OH_Drawing_TextLine* OH_Drawing_GetTextLineByIndex(OH_Drawing_Array* lines, size_t index);
+
+/**
+ * @brief Get the count of glyphs.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @return Returns the count of glyphs.
+ * @since 14
+ * @version 1.0
+ */
+double OH_Drawing_TextLineGetGlyphCount(OH_Drawing_TextLine* line);
+
+/**
+ * @brief Get the range of text line.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @param start Indicates the pointer to text line start position.
+ * @param end Indicates the pointer to text line end position.
+ * @since 14
+ * @version 1.0
+ */
+void OH_Drawing_TextLineGetTextRange(OH_Drawing_TextLine* line, size_t* start, size_t* end);
+
+/**
+ * @brief Get the glyph runs array of text line.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @return Indicates the pointer to a glyph runs array object of text line OH_Drawing_Array.
+ * @since 14
+ * @version 1.0
+ */
+OH_Drawing_Array* OH_Drawing_TextLineGetGlyphRuns(OH_Drawing_TextLine* line);
+
+/**
+ * @brief Releases the memory occupied by the run array object OH_Drawing_Array.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param runs Indicates the pointer to the run array object OH_Drawing_Array.
+ * @since 14
+ * @version 1.0
+ */
+void OH_Drawing_DestroyRuns(OH_Drawing_Array* runs);
+
+/**
+ * @brief Get the run object by index.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param runs Indicates the pointer to the run array object OH_Drawing_Array.
+ * @param index The run object index.
+ * @return Indicates the pointer to a run object OH_Drawing_Run.
+ * @since 14
+ */
+OH_Drawing_Run* OH_Drawing_GetRunByIndex(OH_Drawing_Array* runs, size_t index);
+
+/**
+ * @brief Paint the range of text line.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @param canvas Indicates the pointer to an OH_Drawing_Canvas object.
+ * @param x Represents the X-axis position on the canvas.
+ * @param y Represents the Y-axis position on the canvas.
+ * @since 14
+ * @version 1.0
+ */
+void OH_Drawing_TextLinePaint(OH_Drawing_TextLine* line, OH_Drawing_Canvas* canvas, double x, double y);
+
+/**
+ * @brief Creates a truncated text line object.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @param width Indicates the text line width to set.
+ * @param mode Indicates the ellipsis model to set, EllipsisMode:MIDDLE is not supported.
+ * For details, see the enum OH_Drawing_EllipsisModal.
+ * @param ellipsis Indicates the ellipsis string to set.
+ * @return Returns the pointer to the OH_Drawing_TextLine object created.
+ * @since 14
+ * @version 1.0
+ */
+OH_Drawing_TextLine* OH_Drawing_TextLineCreateTruncatedLine(OH_Drawing_TextLine* line, double width, int mode,
+ const char* ellipsis);
+
+/**
+ * @brief Gets the text line typographic bounds.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @param ascent Indicates the distance that the pointer points to remain above the baseline.
+ * @param descent Indicates the pointer to the distance that remains below the baseline.
+ * @param leading Indicates the pointer to the line Spacing.
+ * @return Returns The total width of the typesetting border.
+ * @since 14
+ * @version 1.0
+ */
+double OH_Drawing_TextLineGetTypographicBounds(OH_Drawing_TextLine* line, double* ascent, double* descent,
+ double* leading);
+
+/**
+ * @brief Gets the text line image bounds.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @return Returns the pointer to the OH_Drawing_Rect struct created.
+ * @since 14
+ * @version 1.0
+ */
+OH_Drawing_Rect* OH_Drawing_TextLineGetImageBounds(OH_Drawing_TextLine* line);
+
+/**
+ * @brief Gets the tail space width.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @return Returns the tail space width.
+ * @since 14
+ * @version 1.0
+ */
+double OH_Drawing_TextLineGetTrailingSpaceWidth(OH_Drawing_TextLine* line);
+
+/**
+ * @brief Gets the string index of the given position.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @param point Indicates the pointer to an OH_Drawing_Point object.
+ * @return Returns the string index for a given position.
+ * @since 14
+ */
+int32_t OH_Drawing_TextLineGetStringIndexForPosition(OH_Drawing_TextLine* line, OH_Drawing_Point* point);
+
+/**
+ * @brief Gets the offset of the given string index.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @param index The given string index.
+ * @return Returns the offset for a given string index.
+ * @since 14
+ */
+double OH_Drawing_TextLineGetOffsetForStringIndex(OH_Drawing_TextLine* line, int32_t index);
+
+/**
+ * @brief User-defined callback functions for using offsets and indexes.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param offset Character offset is traversed as an argument to the callback function.
+ * @param index Character index is traversed as an argument to the callback function.
+ * @param leadingEdge Whether the current offset is at the character front, as an argument to the callback function.
+ * @return The return value of the user-defined callback function.
+ * If false is returned, the traversal continues.
+ * If true is returned, the traversal stops.
+ * @since 14
+ * @version 1.0
+ */
+typedef bool (*Drawing_CaretOffsetsCallback)(double offset, int32_t index, bool leadingEdge);
+
+/**
+ * @brief Enumerate caret offset and index in text lines.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @param callback User-defined callback functions, see Drawing_CaretOffsetsCallback.
+ * @since 14
+ */
+void OH_Drawing_TextLineEnumerateCaretOffsets(OH_Drawing_TextLine* line, Drawing_CaretOffsetsCallback callback);
+
+/**
+ * @brief Gets the text offset based on the given alignment factor and alignment width.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param line Indicates the pointer to an OH_Drawing_TextLine object.
+ * @param alignmentFactor The coefficients that text needs to be aligned.
+ * Less than or equal to 0 is left justified, 0.5 is center justified,
+ * and greater than or equal to 1 is right justified.
+ * @param alignmentWidth The width of the text to be aligned.
+ * Returns 0 if it is less than the actual width of the text.
+ * @return Returns the offset of the aligned text.
+ * @since 14
+ * @version 1.0
+ */
+double OH_Drawing_TextLineGetAlignmentOffset(OH_Drawing_TextLine* line, double alignmentFactor, double alignmentWidth);
+
+#ifdef __cplusplus
+}
+#endif
+/** @} */
+#endif // C_INCLUDE_DRAWING_TEXT_LINE_H
\ No newline at end of file
diff --git a/graphic/graphic_2d/native_drawing/drawing_text_lineTypography.h b/graphic/graphic_2d/native_drawing/drawing_text_lineTypography.h
new file mode 100644
index 0000000000000000000000000000000000000000..d37e6e3b21045c03d9189ef50660a885fa4b1ac6
--- /dev/null
+++ b/graphic/graphic_2d/native_drawing/drawing_text_lineTypography.h
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.. All rights reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @addtogroup Drawing
+ * @{
+ *
+ * @brief Provides the 2D drawing capability.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ *
+ * @since 14
+ * @version 1.0
+ */
+
+/**
+ * @file drawing_text_linetypography.h
+ *
+ * @brief Declares functions related to lineTypography in the drawing module.
+ *
+ * @kit ArkGraphics2D
+ * @library libnative_drawing.so
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @since 14
+ * @version 1.0
+ */
+
+#ifndef DRAWING_TEXT_LINETYPOGRAPHY_H
+#define DRAWING_TEXT_LINETYPOGRAPHY_H
+
+#include "drawing_text_declaration.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Creates an OH_Drawing_LineTypography object.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param handler Indicates the pointer to an OH_Drawing_TypographyCreate object.
+ * @return Returns the pointer to the OH_Drawing_LineTypography object created.
+ * @since 14
+ */
+OH_Drawing_LineTypography* OH_Drawing_CreateLineTypography(OH_Drawing_TypographyCreate* handler);
+
+/**
+ * @brief Releases the memory occupied by an OH_Drawing_LineTypography object.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param lineTypography Indicates the pointer to an OH_Drawing_LineTypography object.
+ * @since 14
+ */
+void OH_Drawing_DestroyLineTypography(OH_Drawing_LineTypography* lineTypography);
+
+/**
+ * @brief Calculate the line breakpoint based on the width provided.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param lineTypography Indicates the pointer to an OH_Drawing_TypographyCreate object.
+ * @param startIndex Indicates the starting point for the line-break calculations.
+ * @param width Indicates the requested line-break width.
+ * @return Returns the count of the characters from startIndex that would cause the line break.
+ * @since 14
+ */
+size_t OH_Drawing_LineTypographyGetLineBreak(OH_Drawing_LineTypography* lineTypography,
+ size_t startIndex, double width);
+
+/**
+ * @brief Creates a text line object based on the text range provided.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param lineTypography Indicates the pointer to an OH_Drawing_TypographyCreate object.
+ * @param startIndex Indicates the starting index of the text range.
+ * @param count Indicates the characters count of the text range.
+ * @return Returns the pointer to the OH_Drawing_TextLine object created.
+ * @since 14
+ */
+OH_Drawing_TextLine* OH_Drawing_LineTypographyCreateLine(OH_Drawing_LineTypography* lineTypography,
+ size_t startIndex, size_t count);
+
+#ifdef __cplusplus
+}
+#endif
+/** @} */
+#endif
diff --git a/graphic/graphic_2d/native_drawing/drawing_text_run.h b/graphic/graphic_2d/native_drawing/drawing_text_run.h
new file mode 100644
index 0000000000000000000000000000000000000000..7237fd88cd36779a9627d5d95d790b75df879e83
--- /dev/null
+++ b/graphic/graphic_2d/native_drawing/drawing_text_run.h
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @addtogroup Drawing
+ * @{
+ *
+ * @brief Provides the text run capability.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ *
+ * @since 14
+ * @version 1.0
+ */
+
+/**
+ * @file drawing_text_run.h
+ *
+ * @brief Declares functions related to run in the drawing module.
+ *
+ * @kit ArkGraphics2D
+ * @library libnative_drawing.so
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @since 14
+ * @version 1.0
+ */
+
+#ifndef C_INCLUDE_DRAWING_TEXT_RUN_H
+#define C_INCLUDE_DRAWING_TEXT_RUN_H
+
+#include "drawing_text_declaration.h"
+#include "drawing_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/**
+ * @brief Gets the run glyph indices ,the offset of the index relative to the entire paragraph.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param run Indicates the pointer to an OH_Drawing_Run object.
+ * @param start The run of start index.
+ * @param length The run of length, if start and length are set to 0, then get all of the current run.
+ * @return Run of glyph indices array object OH_Drawing_Array.
+ * @since 14
+ */
+OH_Drawing_Array* OH_Drawing_GetRunStringIndices(OH_Drawing_Run* run, int64_t start, int64_t length);
+
+/**
+ * @brief Gets the run glyph indices by index.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param stringIndices the run glyph indices array object OH_Drawing_Array.
+ * @param index The run of glyph index.
+ * @return Run of glyph indices element.
+ * @since 14
+ */
+uint64_t OH_Drawing_GetRunStringIndicesByIndex(OH_Drawing_Array* stringIndices, size_t index);
+
+/**
+ * @brief Releases the memory run glyph indices array.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param stringIndices glyph indices array object OH_Drawing_Array.
+ * @since 14
+ */
+void OH_Drawing_DestroyRunStringIndices(OH_Drawing_Array* stringIndices);
+
+/**
+ * @brief Gets the range run glyph location and length.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param run Indicates the pointer to an OH_Drawing_Run object.
+ * @param location The run of glyph location.
+ * @param length The run of glyph length.
+ * @since 14
+ */
+void OH_Drawing_GetRunStringRange(OH_Drawing_Run* run, uint64_t* location, uint64_t* length);
+
+/**
+ * @brief Gets the run typographic bound.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param run Indicates the pointer to an OH_Drawing_Run object.
+ * @param ascent The run of ascent.
+ * @param descent The run of descent.
+ * @param leading The run of leading.
+ * @return run typographic width.
+ * @since 14
+ */
+float OH_Drawing_GetRunTypographicBounds(OH_Drawing_Run* run, float* ascent, float* descent, float* leading);
+
+/**
+ * @brief Paints text on the canvas.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param canvas Indicates the pointer to an OH_Drawing_Canvas object.
+ * @param run Indicates the pointer to an OH_Drawing_Run object.
+ * @param x Indicates the x coordinate.
+ * @param y Indicates the y coordinate.
+ * @since 14
+ */
+void OH_Drawing_RunPaint(OH_Drawing_Canvas* canvas, OH_Drawing_Run* run, double x, double y);
+
+/**
+ * @brief Gets the run image bound.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param run Indicates the pointer to an OH_Drawing_Run object.
+ * @return The run image bounds to an OH_Drawing_Rect object.
+ * @since 14
+ */
+OH_Drawing_Rect* OH_Drawing_GetRunImageBounds(OH_Drawing_Run* run);
+
+ /**
+ * @brief Releases the memory run image bounds pointer.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param rect Run image bounds to an OH_Drawing_Rect object.
+ * @since 14
+ */
+void OH_Drawing_DestroyRunImageBounds(OH_Drawing_Rect* rect);
+
+/**
+ * @brief Gets the range glyph identifier for each character.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param run Indicates the pointer to an OH_Drawing_Run object.
+ * @param start The run of start index.
+ * @param length The run of length, if start and length are set to 0, then get all of the current run.
+ * @return Run of glyph array object OH_Drawing_ArrayOH_Drawing_Array.
+ * @param index The run of glyph index.
+ * @return Run of glyph element.
+ * @since 14
+ * @version 1.0
+ */
+uint16_t OH_Drawing_GetRunGlyphsByIndex(OH_Drawing_Array* glyphs, size_t index);
+
+/**
+ * @brief Releases the memory run glyph array.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param glyphs The run of glyph array object OH_Drawing_Array.
+ * @since 14
+ */
+void OH_Drawing_DestroyRunGlyphs(OH_Drawing_Array* glyphs);
+
+/**
+ * @brief Gets the range glyph position array.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param run Indicates the pointer to an OH_Drawing_Run object.
+ * @param start The run of start index.
+ * @param length The run of length, if start and length are set to 0, then get all of the current run.
+ * @return Run of position array object OH_Drawing_Array.
+ * @since 14
+ */
+OH_Drawing_Array* OH_Drawing_GetRunPositions(OH_Drawing_Run* run, int64_t start, int64_t length);
+
+/**
+ * @brief Gets the glyph position by index.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param positions The run of position array object OH_Drawing_Array.
+ * @param index The run of glyph index.
+ * @return Run of glyph position pointer to an OH_Drawing_Point object.
+ * @since 14
+ * @version 1.0
+ */
+OH_Drawing_Point* OH_Drawing_GetRunPositionsByIndex(OH_Drawing_Array* positions, size_t index);
+
+/**
+ * @brief Releases the memory run of position array.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param positions The run of position array object OH_Drawing_Array.
+ * @since 14
+ */
+void OH_Drawing_DestroyRunPositions(OH_Drawing_Array* positions);
+
+/**
+ * @brief Gets the number of glyph.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param run Indicates the pointer to an OH_Drawing_Run object.
+ * @return The number of glyph.
+ * @since 14
+ */
+uint32_t OH_Drawing_GetRunGlyphCount(OH_Drawing_Run* run);
+#ifdef __cplusplus
+}
+#endif
+/** @} */
+#endif // C_INCLUDE_DRAWING_TEXT_RUN_H
diff --git a/graphic/graphic_2d/native_drawing/drawing_text_typography.h b/graphic/graphic_2d/native_drawing/drawing_text_typography.h
index c71caed769dd93b5a14361c2463d7395cafdd0a2..275f0af37cb9a77e498368ab9905533dd884f801 100644
--- a/graphic/graphic_2d/native_drawing/drawing_text_typography.h
+++ b/graphic/graphic_2d/native_drawing/drawing_text_typography.h
@@ -13,9 +13,6 @@
* limitations under the License.
*/
-#ifndef C_INCLUDE_DRAWING_TEXT_TYPOGRAPHY_H
-#define C_INCLUDE_DRAWING_TEXT_TYPOGRAPHY_H
-
/**
* @addtogroup Drawing
* @{
@@ -40,6 +37,9 @@
* @version 1.0
*/
+#ifndef C_INCLUDE_DRAWING_TEXT_TYPOGRAPHY_H
+#define C_INCLUDE_DRAWING_TEXT_TYPOGRAPHY_H
+
#ifdef __cplusplus
#include
#include
@@ -60,6 +60,9 @@ extern "C" {
/**
* @brief Enumerates text directions.
+ *
+ * @since 8
+ * @version 1.0
*/
enum OH_Drawing_TextDirection {
/** Right to left (RTL) */
@@ -70,6 +73,9 @@ enum OH_Drawing_TextDirection {
/**
* @brief Enumerates text alignment modes.
+ *
+ * @since 8
+ * @version 1.0
*/
enum OH_Drawing_TextAlign {
/** Left-aligned */
@@ -101,6 +107,9 @@ enum OH_Drawing_TextAlign {
/**
* @brief Enumerates font weights.
+ *
+ * @since 8
+ * @version 1.0
*/
enum OH_Drawing_FontWeight {
/** Thin */
@@ -125,6 +134,9 @@ enum OH_Drawing_FontWeight {
/**
* @brief Enumerates text baselines.
+ *
+ * @since 8
+ * @version 1.0
*/
enum OH_Drawing_TextBaseline {
/** Alphabetic, where the letters in alphabets like English sit on. */
@@ -135,6 +147,9 @@ enum OH_Drawing_TextBaseline {
/**
* @brief Enumerates text decorations.
+ *
+ * @since 8
+ * @version 1.0
*/
enum OH_Drawing_TextDecoration {
/** No decoration. */
@@ -149,6 +164,9 @@ enum OH_Drawing_TextDecoration {
/**
* @brief Enumerates font styles.
+ *
+ * @since 8
+ * @version 1.0
*/
enum OH_Drawing_FontStyle {
/** Normal style */
@@ -625,44 +643,44 @@ OH_Drawing_TypographyStyle* OH_Drawing_CreateTypographyStyle(void);
* @brief Releases the memory occupied by an OH_Drawing_TypographyStyle object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
* @since 8
* @version 1.0
*/
-void OH_Drawing_DestroyTypographyStyle(OH_Drawing_TypographyStyle*);
+void OH_Drawing_DestroyTypographyStyle(OH_Drawing_TypographyStyle* style);
/**
* @brief Sets the text direction.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
- * @param int Indicates the text direction to set. For details, see the enum OH_Drawing_TextDirection.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param direction Indicates the text direction to set. For details, see the enum OH_Drawing_TextDirection.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextDirection(OH_Drawing_TypographyStyle*, int /* OH_Drawing_TextDirection */);
+void OH_Drawing_SetTypographyTextDirection(OH_Drawing_TypographyStyle* style, int direction);
/**
* @brief Sets the text alignment mode.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
- * @param int Indicates the text alignment mode to set. For details, see the enum OH_Drawing_TextAlign.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param align Indicates the text alignment mode to set. For details, see the enum OH_Drawing_TextAlign.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextAlign(OH_Drawing_TypographyStyle*, int /* OH_Drawing_TextAlign */);
+void OH_Drawing_SetTypographyTextAlign(OH_Drawing_TypographyStyle* style, int align);
/**
* @brief Sets the maximum number of lines in a text file.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
- * @param int Indicates the maximum number of lines to set.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param lineNumber Indicates the maximum number of lines to set.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextMaxLines(OH_Drawing_TypographyStyle*, int /* maxLines */);
+void OH_Drawing_SetTypographyTextMaxLines(OH_Drawing_TypographyStyle* style, int lineNumber);
/**
* @brief Creates an OH_Drawing_TextStyle object.
@@ -678,360 +696,386 @@ OH_Drawing_TextStyle* OH_Drawing_CreateTextStyle(void);
* @brief Releases the memory occupied by an OH_Drawing_TextStyle object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @since 8
* @version 1.0
*/
-void OH_Drawing_DestroyTextStyle(OH_Drawing_TextStyle*);
+void OH_Drawing_DestroyTextStyle(OH_Drawing_TextStyle* style);
/**
* @brief Sets the text color.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param uint32_t Indicates the color to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param color Indicates the color to set.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTextStyleColor(OH_Drawing_TextStyle*, uint32_t /* color */);
+void OH_Drawing_SetTextStyleColor(OH_Drawing_TextStyle* style, uint32_t color);
/**
* @brief Sets the font size.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param double Indicates the font size to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param fontSize Indicates the font size to set.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTextStyleFontSize(OH_Drawing_TextStyle*, double /* fontSize */);
+void OH_Drawing_SetTextStyleFontSize(OH_Drawing_TextStyle* style, double fontSize);
/**
* @brief Sets the font weight.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param int Indicates the font weight to set. For details, see the enum OH_Drawing_FontWeight.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param fontWeight Indicates the font weight to set. For details, see the enum OH_Drawing_FontWeight.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTextStyleFontWeight(OH_Drawing_TextStyle*, int /* OH_Drawing_FontWeight */);
+void OH_Drawing_SetTextStyleFontWeight(OH_Drawing_TextStyle* style, int fontWeight);
/**
* @brief Sets the text baseline.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param int Indicates the text baseline to set. For details, see the enum OH_Drawing_TextBaseline.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param baseline Indicates the text baseline to set. For details, see the enum OH_Drawing_TextBaseline.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTextStyleBaseLine(OH_Drawing_TextStyle*, int /* OH_Drawing_TextBaseline */);
+void OH_Drawing_SetTextStyleBaseLine(OH_Drawing_TextStyle* style, int baseline);
/**
* @brief Sets the text decoration.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param int Indicates the text decoration to set. For details, see the enum OH_Drawing_TextDecoration.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param decoration Indicates the text decoration to set. For details, see the enum OH_Drawing_TextDecoration.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTextStyleDecoration(OH_Drawing_TextStyle*, int /* OH_Drawing_TextDecoration */);
+void OH_Drawing_SetTextStyleDecoration(OH_Drawing_TextStyle* style, int decoration);
+
+/**
+ * @brief Add the text decoration.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param decoration Indicates the text decoration to add. For details, see the enum OH_Drawing_TextDecoration.
+ * @since 14
+ * @version 1.0
+ */
+void OH_Drawing_AddTextStyleDecoration(OH_Drawing_TextStyle* style, int decoration);
+
+/**
+ * @brief Remove the text decoration.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param decoration Indicates the text decoration to remove, shoud be match existing text decorations.
+ * For details, see the enum OH_Drawing_TextDecoration.
+ * @since 14
+ * @version 1.0
+ */
+void OH_Drawing_RemoveTextStyleDecoration(OH_Drawing_TextStyle* style, int decoration);
/**
* @brief Sets the color for the text decoration.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param uint32_t Indicates the color to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param color Indicates the color to set.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTextStyleDecorationColor(OH_Drawing_TextStyle*, uint32_t /* color */);
+void OH_Drawing_SetTextStyleDecorationColor(OH_Drawing_TextStyle* style, uint32_t color);
/**
* @brief Sets the font height.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param double Indicates the font height to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param fontHeight Indicates the font height to set.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTextStyleFontHeight(OH_Drawing_TextStyle*, double /* fontHeight */);
+void OH_Drawing_SetTextStyleFontHeight(OH_Drawing_TextStyle* style, double fontHeight);
/**
* @brief Sets the font families.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param int Indicates the number of font families to set.
- * @param char Indicates the pointer to the font families to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param fontFamiliesNumber Indicates the number of font families to set.
+ * @param fontFamilies Indicates the pointer to the font families to set.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTextStyleFontFamilies(OH_Drawing_TextStyle*,
- int /* fontFamiliesNumber */, const char* fontFamilies[]);
+void OH_Drawing_SetTextStyleFontFamilies(OH_Drawing_TextStyle* style,
+ int fontFamiliesNumber, const char* fontFamilies[]);
/**
* @brief Sets the font style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param int Indicates the font style to set. For details, see the enum OH_Drawing_FontStyle.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param fontStyle Indicates the font style to set. For details, see the enum OH_Drawing_FontStyle.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTextStyleFontStyle(OH_Drawing_TextStyle*, int /* OH_Drawing_FontStyle */);
+void OH_Drawing_SetTextStyleFontStyle(OH_Drawing_TextStyle* style, int fontStyle);
/**
* @brief Sets the locale.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param char Indicates the pointer to the locale to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param locale Indicates the pointer to the locale to set.
* @since 8
* @version 1.0
*/
-void OH_Drawing_SetTextStyleLocale(OH_Drawing_TextStyle*, const char*);
+void OH_Drawing_SetTextStyleLocale(OH_Drawing_TextStyle* style, const char* locale);
/**
* @brief Sets the foreground brush style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
- * @param OH_Drawing_Brush Indicates the pointer to a brush object OH_Drawing_Brush.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param foregroundBrush Indicates the pointer to a brush object OH_Drawing_Brush.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTextStyleForegroundBrush(OH_Drawing_TextStyle*, OH_Drawing_Brush*);
+void OH_Drawing_SetTextStyleForegroundBrush(OH_Drawing_TextStyle* style, OH_Drawing_Brush* foregroundBrush);
/**
* @brief Gets the foreground brush style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
- * @param OH_Drawing_Brush Indicates the pointer to a brush object OH_Drawing_Brush.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param foregroundBrush Indicates the pointer to a brush object OH_Drawing_Brush.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleGetForegroundBrush(OH_Drawing_TextStyle*, OH_Drawing_Brush*);
+void OH_Drawing_TextStyleGetForegroundBrush(OH_Drawing_TextStyle* style, OH_Drawing_Brush* foregroundBrush);
/**
* @brief Sets the foreground pen style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
- * @param OH_Drawing_Pen Indicates the pointer to a pen object OH_Drawing_Pen.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param foregroundPen Indicates the pointer to a pen object OH_Drawing_Pen.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTextStyleForegroundPen(OH_Drawing_TextStyle*, OH_Drawing_Pen*);
+void OH_Drawing_SetTextStyleForegroundPen(OH_Drawing_TextStyle* style, OH_Drawing_Pen* foregroundPen);
/**
* @brief Gets the foreground pen style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
- * @param OH_Drawing_Pen Indicates the pointer to a pen object OH_Drawing_Pen.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param foregroundPen Indicates the pointer to a pen object OH_Drawing_Pen.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleGetForegroundPen(OH_Drawing_TextStyle*, OH_Drawing_Pen*);
+void OH_Drawing_TextStyleGetForegroundPen(OH_Drawing_TextStyle* style, OH_Drawing_Pen* foregroundPen);
/**
* @brief Sets the background brush style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
- * @param OH_Drawing_Brush Indicates the pointer to a brush object OH_Drawing_Brush.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param foregroundPen Indicates the pointer to a brush object OH_Drawing_Brush.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTextStyleBackgroundBrush(OH_Drawing_TextStyle*, OH_Drawing_Brush*);
+void OH_Drawing_SetTextStyleBackgroundBrush(OH_Drawing_TextStyle* style, OH_Drawing_Brush* foregroundPen);
/**
* @brief Gets the background brush style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
- * @param OH_Drawing_Brush Indicates the pointer to a brush object OH_Drawing_Brush.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param backgroundBrush Indicates the pointer to a brush object OH_Drawing_Brush.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleGetBackgroundBrush(OH_Drawing_TextStyle*, OH_Drawing_Brush*);
+void OH_Drawing_TextStyleGetBackgroundBrush(OH_Drawing_TextStyle* style, OH_Drawing_Brush* backgroundBrush);
/**
* @brief Sets the background pen style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
- * @param OH_Drawing_Pen Indicates the pointer to a pen object OH_Drawing_Pen.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param backgroundPen Indicates the pointer to a pen object OH_Drawing_Pen.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTextStyleBackgroundPen(OH_Drawing_TextStyle*, OH_Drawing_Pen*);
+void OH_Drawing_SetTextStyleBackgroundPen(OH_Drawing_TextStyle* style, OH_Drawing_Pen* backgroundPen);
/**
* @brief Gets the background pen style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
- * @param OH_Drawing_Pen Indicates the pointer to a pen object OH_Drawing_Pen.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param backgroundPen Indicates the pointer to a pen object OH_Drawing_Pen.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleGetBackgroundPen(OH_Drawing_TextStyle*, OH_Drawing_Pen*);
+void OH_Drawing_TextStyleGetBackgroundPen(OH_Drawing_TextStyle* style, OH_Drawing_Pen* backgroundPen);
/**
* @brief Creates a pointer to an OH_Drawing_TypographyCreate object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
- * @param OH_Drawing_FontCollection Indicates the pointer to an OH_Drawing_FontCollection object.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param fontCollection Indicates the pointer to an OH_Drawing_FontCollection object.
* @return Returns the pointer to the OH_Drawing_TypographyCreate object created.
* @since 8
* @version 1.0
*/
-OH_Drawing_TypographyCreate* OH_Drawing_CreateTypographyHandler(OH_Drawing_TypographyStyle*,
- OH_Drawing_FontCollection*);
+OH_Drawing_TypographyCreate* OH_Drawing_CreateTypographyHandler(OH_Drawing_TypographyStyle* style,
+ OH_Drawing_FontCollection* fontCollection);
/**
* @brief Releases the memory occupied by an OH_Drawing_TypographyCreate object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyCreate Indicates the pointer to an OH_Drawing_TypographyCreate object.
+ * @param handler Indicates the pointer to an OH_Drawing_TypographyCreate object.
* @since 8
* @version 1.0
*/
-void OH_Drawing_DestroyTypographyHandler(OH_Drawing_TypographyCreate*);
+void OH_Drawing_DestroyTypographyHandler(OH_Drawing_TypographyCreate* handler);
/**
* @brief Sets the text style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyCreate Indicates the pointer to an OH_Drawing_TypographyCreate object.
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param handler Indicates the pointer to an OH_Drawing_TypographyCreate object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @since 8
* @version 1.0
*/
-void OH_Drawing_TypographyHandlerPushTextStyle(OH_Drawing_TypographyCreate*, OH_Drawing_TextStyle*);
+void OH_Drawing_TypographyHandlerPushTextStyle(OH_Drawing_TypographyCreate* handler, OH_Drawing_TextStyle* style);
/**
* @brief Sets the text content.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyCreate Indicates the pointer to an OH_Drawing_TypographyCreate object.
- * @param char Indicates the pointer to the text content to set.
+ * @param handler Indicates the pointer to an OH_Drawing_TypographyCreate object.
+ * @param text Indicates the pointer to the text content to set.
* @since 8
* @version 1.0
*/
-void OH_Drawing_TypographyHandlerAddText(OH_Drawing_TypographyCreate*, const char*);
+void OH_Drawing_TypographyHandlerAddText(OH_Drawing_TypographyCreate* handler, const char* text);
/**
* @brief Removes the topmost style in the stack, leaving the remaining styles in effect.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyCreate Indicates the pointer to an OH_Drawing_TypographyCreate object.
+ * @param handler Indicates the pointer to an OH_Drawing_TypographyCreate object.
* @since 8
* @version 1.0
*/
-void OH_Drawing_TypographyHandlerPopTextStyle(OH_Drawing_TypographyCreate*);
+void OH_Drawing_TypographyHandlerPopTextStyle(OH_Drawing_TypographyCreate* handler);
/**
* @brief Creates an OH_Drawing_Typography object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyCreate Indicates the pointer to an OH_Drawing_TypographyCreate object.
+ * @param handler Indicates the pointer to an OH_Drawing_TypographyCreate object.
* @return Returns the pointer to the OH_Drawing_Typography object created.
* @since 8
* @version 1.0
*/
-OH_Drawing_Typography* OH_Drawing_CreateTypography(OH_Drawing_TypographyCreate*);
+OH_Drawing_Typography* OH_Drawing_CreateTypography(OH_Drawing_TypographyCreate* handler);
/**
* @brief Releases the memory occupied by an OH_Drawing_Typography object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
* @since 8
* @version 1.0
*/
-void OH_Drawing_DestroyTypography(OH_Drawing_Typography*);
+void OH_Drawing_DestroyTypography(OH_Drawing_Typography* typography);
/**
* @brief Lays out the typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
- * @param double Indicates the maximum text width to set.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param maxWidth Indicates the maximum text width to set.
* @since 8
* @version 1.0
*/
-void OH_Drawing_TypographyLayout(OH_Drawing_Typography*, double /* maxWidth */);
+void OH_Drawing_TypographyLayout(OH_Drawing_Typography* typography, double maxWidth);
/**
* @brief Paints text on the canvas.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
- * @param OH_Drawing_Canvas Indicates the pointer to an OH_Drawing_Canvas object.
- * @param double Indicates the x coordinate.
- * @param double Indicates the y coordinate.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param canvas Indicates the pointer to an OH_Drawing_Canvas object.
+ * @param potisionX Indicates the x coordinate.
+ * @param potisionY Indicates the y coordinate.
* @since 8
* @version 1.0
*/
-void OH_Drawing_TypographyPaint(OH_Drawing_Typography*, OH_Drawing_Canvas*,
- double /* potisionX */, double /* potisionY */);
+void OH_Drawing_TypographyPaint(OH_Drawing_Typography* typography, OH_Drawing_Canvas* canvas,
+ double potisionX, double potisionY);
/**
* @brief Paints path text on the canvas.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
- * @param OH_Drawing_Canvas Indicates the pointer to an OH_Drawing_Canvas object.
- * @param OH_Drawing_Path Indicates path information.
- * @param double Indicates the distance along the path to add to the text's starting position.
- * @param double Indicates the distance above(-) or below(+) the path to position the text.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param canvas Indicates the pointer to an OH_Drawing_Canvas object.
+ * @param path Indicates path information.
+ * @param hOffset Indicates the distance along the path to add to the text's starting position.
+ * @param vOffset Indicates the distance above(-) or below(+) the path to position the text.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TypographyPaintOnPath(OH_Drawing_Typography*, OH_Drawing_Canvas*, OH_Drawing_Path*,
- double /* hOffset */, double /* vOffset */);
+void OH_Drawing_TypographyPaintOnPath(OH_Drawing_Typography* typography, OH_Drawing_Canvas* canvas,
+ OH_Drawing_Path* path, double hOffset, double vOffset);
/**
* @brief Gets the max width.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
* @return Returns the max width.
* @since 9
* @version 1.1
*/
-double OH_Drawing_TypographyGetMaxWidth(OH_Drawing_Typography*);
+double OH_Drawing_TypographyGetMaxWidth(OH_Drawing_Typography* typography);
/**
* @brief Gets the height.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
* @return Returns the height.
* @since 9
* @version 1.1
*/
-double OH_Drawing_TypographyGetHeight(OH_Drawing_Typography*);
+double OH_Drawing_TypographyGetHeight(OH_Drawing_Typography* typography);
/**
- * @brief Gets the longest line.
+ * @brief Obtains the width of the longest line. You are advised to round up the return value in actual use.
+ * When the text content is empty, the minimum float value,
+ * that is, -340282346638528859811704183484516925440.000000, is returned.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
- * @return Returns the length of the longest line.
+ * @param typography Pointer to an OH_Drawing_Typography object, which is obtained by
+ * {@link OH_Drawing_CreateTypography}.
+ * @return Returns the width of the longest line.
* @since 9
* @version 1.1
*/
-double OH_Drawing_TypographyGetLongestLine(OH_Drawing_Typography*);
+double OH_Drawing_TypographyGetLongestLine(OH_Drawing_Typography* typography);
/**
* @brief Obtains the width of the longest line with indent. You are advised to
@@ -1039,422 +1083,423 @@ double OH_Drawing_TypographyGetLongestLine(OH_Drawing_Typography*);
* minimum float value, that is, 0.0, is returned.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Pointer to an OH_Drawing_Typography object, which is obtained by
+ * @param typography Pointer to an OH_Drawing_Typography object, which is obtained by
* {@link OH_Drawing_CreateTypography}.
* @return Returns the width of the longest line with indent.
* @since 13
* @version 1.1
*/
-double OH_Drawing_TypographyGetLongestLineWithIndent(OH_Drawing_Typography*);
+double OH_Drawing_TypographyGetLongestLineWithIndent(OH_Drawing_Typography* typography);
/**
* @brief Gets the min intrinsic width.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param typography the pointer to an OH_Drawing_Typography object.
* @return Returns the min intrinsic width.
* @since 9
* @version 1.1
*/
-double OH_Drawing_TypographyGetMinIntrinsicWidth(OH_Drawing_Typography*);
+double OH_Drawing_TypographyGetMinIntrinsicWidth(OH_Drawing_Typography* typography);
/**
* @brief Gets the max intrinsic width.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
* @return Returns the max intrinsic width.
* @since 9
* @version 1.1
*/
-double OH_Drawing_TypographyGetMaxIntrinsicWidth(OH_Drawing_Typography*);
+double OH_Drawing_TypographyGetMaxIntrinsicWidth(OH_Drawing_Typography* typography);
/**
* @brief Gets the alphabetic baseline.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
* @return Returns the alphabetic baseline.
* @since 9
* @version 1.1
*/
-double OH_Drawing_TypographyGetAlphabeticBaseline(OH_Drawing_Typography*);
+double OH_Drawing_TypographyGetAlphabeticBaseline(OH_Drawing_Typography* typography);
/**
* @brief Gets the ideographic baseline.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
* @return Returns the ideographic baseline.
* @since 9
* @version 1.1
*/
-double OH_Drawing_TypographyGetIdeographicBaseline(OH_Drawing_Typography*);
+double OH_Drawing_TypographyGetIdeographicBaseline(OH_Drawing_Typography* typography);
/**
* @brief Sets the placeholder.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyCreate Indicates the pointer to an OH_Drawing_TypographyCreate object.
- * @param OH_Drawing_PlaceholderSpan Indicates the pointer to an OH_Drawing_PlaceholderSpan object.
+ * @param handler Indicates the pointer to an OH_Drawing_TypographyCreate object.
+ * @param span Indicates the pointer to an OH_Drawing_PlaceholderSpan object.
* @since 11
* @version 1.0
*/
-void OH_Drawing_TypographyHandlerAddPlaceholder(OH_Drawing_TypographyCreate*, OH_Drawing_PlaceholderSpan*);
+void OH_Drawing_TypographyHandlerAddPlaceholder(OH_Drawing_TypographyCreate* handler, OH_Drawing_PlaceholderSpan* span);
/**
* @brief Gets the exceed maxLines.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
* @return Returns the exceed maxLines.
* @since 11
* @version 1.0
*/
-bool OH_Drawing_TypographyDidExceedMaxLines(OH_Drawing_Typography*);
+bool OH_Drawing_TypographyDidExceedMaxLines(OH_Drawing_Typography* typography);
/**
* @brief Gets the rects for range.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
- * @param size_t Indicates the start of range to set.
- * @param size_t Indicates the end of range to set.
- * @param OH_Drawing_RectHeightStyle Indicates the height style to set.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param start Indicates the start of range to set.
+ * @param end Indicates the end of range to set.
+ * @param heightStyle Indicates the height style to set.
* For details, see the enum OH_Drawing_RectHeightStyle.
- * @param OH_Drawing_RectWidthStyle Indicates the width style to set.
+ * @param widthStyle Indicates the width style to set.
* For details, see the enum OH_Drawing_RectWidthStyle.
* @return Returns the rects for range.
* @since 11
* @version 1.0
*/
-OH_Drawing_TextBox* OH_Drawing_TypographyGetRectsForRange(OH_Drawing_Typography*,
- size_t, size_t, OH_Drawing_RectHeightStyle, OH_Drawing_RectWidthStyle);
+OH_Drawing_TextBox* OH_Drawing_TypographyGetRectsForRange(OH_Drawing_Typography* typography,
+ size_t start, size_t end, OH_Drawing_RectHeightStyle heightStyle, OH_Drawing_RectWidthStyle widthStyle);
/**
* @brief Gets the rects for placeholders.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
* @return Returns the rects for placeholders.
* @since 11
* @version 1.0
*/
-OH_Drawing_TextBox* OH_Drawing_TypographyGetRectsForPlaceholders(OH_Drawing_Typography*);
+OH_Drawing_TextBox* OH_Drawing_TypographyGetRectsForPlaceholders(OH_Drawing_Typography* typography);
/**
* @brief Gets left from textbox.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBox Indicates the pointer to an OH_Drawing_TextBox object.
- * @param int Indicates the index of textbox.
+ * @param textbox Indicates the pointer to an OH_Drawing_TextBox object.
+ * @param index Indicates the index of textbox.
* @return Returns left from textbox.
* @since 11
* @version 1.0
*/
-float OH_Drawing_GetLeftFromTextBox(OH_Drawing_TextBox*, int);
+float OH_Drawing_GetLeftFromTextBox(OH_Drawing_TextBox* textbox, int index);
/**
* @brief Gets right from textbox.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBox Indicates the pointer to an OH_Drawing_TextBox object.
- * @param int Indicates the index of textbox.
+ * @param textbox Indicates the pointer to an OH_Drawing_TextBox object.
+ * @param index Indicates the index of textbox.
* @return Returns right from textbox.
* @since 11
* @version 1.0
*/
-float OH_Drawing_GetRightFromTextBox(OH_Drawing_TextBox*, int);
+float OH_Drawing_GetRightFromTextBox(OH_Drawing_TextBox* textbox, int index);
/**
* @brief Gets top from textbox.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBox Indicates the pointer to an OH_Drawing_TextBox object.
- * @param int Indicates the index of textbox.
+ * @param textbox Indicates the pointer to an OH_Drawing_TextBox object.
+ * @param index Indicates the index of textbox.
* @return Returns top from textbox.
* @since 11
* @version 1.0
*/
-float OH_Drawing_GetTopFromTextBox(OH_Drawing_TextBox*, int);
+float OH_Drawing_GetTopFromTextBox(OH_Drawing_TextBox* textbox, int index);
/**
* @brief Gets bottom from textbox.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBox Indicates the pointer to an OH_Drawing_TextBox object.
- * @param int Indicates the index of textbox.
+ * @param textbox Indicates the pointer to an OH_Drawing_TextBox object.
+ * @param index Indicates the index of textbox.
* @return Returns bottom from textbox.
* @since 11
* @version 1.0
*/
-float OH_Drawing_GetBottomFromTextBox(OH_Drawing_TextBox*, int);
+float OH_Drawing_GetBottomFromTextBox(OH_Drawing_TextBox* textbox, int index);
/**
* @brief Gets direction from textbox.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBox Indicates the pointer to an OH_Drawing_TextBox object.
- * @param int Indicates the index of textbox.
+ * @param textbox Indicates the pointer to an OH_Drawing_TextBox object.
+ * @param index Indicates the index of textbox.
* @return Returns direction from textbox.
* @since 11
* @version 1.0
*/
-int OH_Drawing_GetTextDirectionFromTextBox(OH_Drawing_TextBox*, int);
+int OH_Drawing_GetTextDirectionFromTextBox(OH_Drawing_TextBox* textbox, int index);
/**
- * @brief Gets size of textbox.
+ * @brief Gets size of textBox.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBox Indicates the pointer to an OH_Drawing_TextBox object.
- * @return Returns size of textbox.
+ * @param textBox Indicates the pointer to an OH_Drawing_TextBox object.
+ * @return Returns size of textBox.
* @since 11
* @version 1.0
*/
-size_t OH_Drawing_GetSizeOfTextBox(OH_Drawing_TextBox*);
+size_t OH_Drawing_GetSizeOfTextBox(OH_Drawing_TextBox* textBox);
/**
* @brief Gets the glyphposition at coordinate.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
- * @param double Indicates the positionX of typography to set.
- * @param double Indicates the positionY of typography to set.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param dx Indicates the positionX of typography to set.
+ * @param dy Indicates the positionY of typography to set.
* @return Returns the glyphposition at coordinate.
* @since 11
* @version 1.0
*/
-OH_Drawing_PositionAndAffinity* OH_Drawing_TypographyGetGlyphPositionAtCoordinate(OH_Drawing_Typography*,
- double, double);
+OH_Drawing_PositionAndAffinity* OH_Drawing_TypographyGetGlyphPositionAtCoordinate(OH_Drawing_Typography* typography,
+ double dx, double dy);
/**
* @brief Gets the glyphposition at coordinate with cluster.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
- * @param double Indicates the positionX of typography to set.
- * @param double Indicates the positionY of typography to set.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param dx Indicates the positionX of typography to set.
+ * @param dy Indicates the positionY of typography to set.
* @return Returns the glyphposition at coordinate with cluster.
* @since 11
* @version 1.0
*/
-OH_Drawing_PositionAndAffinity* OH_Drawing_TypographyGetGlyphPositionAtCoordinateWithCluster(OH_Drawing_Typography*,
- double, double);
+OH_Drawing_PositionAndAffinity* OH_Drawing_TypographyGetGlyphPositionAtCoordinateWithCluster(
+ OH_Drawing_Typography* typography, double dx, double dy);
/**
* @brief Gets position from position and affinity.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_PositionAndAffinity Indicates the pointer to an OH_Drawing_PositionAndAffinity object.
+ * @param positionAndAffinity Indicates the pointer to an OH_Drawing_PositionAndAffinity object.
* @return Returns position from position and affinity.
* @since 11
* @version 1.0
*/
-size_t OH_Drawing_GetPositionFromPositionAndAffinity(OH_Drawing_PositionAndAffinity*);
+size_t OH_Drawing_GetPositionFromPositionAndAffinity(OH_Drawing_PositionAndAffinity* positionAndAffinity);
/**
* @brief Gets affinity from position and affinity.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_PositionAndAffinity Indicates the pointer to an OH_Drawing_PositionAndAffinity object.
+ * @param positionandaffinity Indicates the pointer to an OH_Drawing_PositionAndAffinity object.
* @return Returns affinity from position and affinity.
* @since 11
* @version 1.0
*/
-int OH_Drawing_GetAffinityFromPositionAndAffinity(OH_Drawing_PositionAndAffinity*);
+int OH_Drawing_GetAffinityFromPositionAndAffinity(OH_Drawing_PositionAndAffinity* positionandaffinity);
/**
* @brief Gets the word boundary.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
- * @param size_t Indicates the size of text to set.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param offset Indicates the size of text to set.
* @return Returns the word boundary.
* @since 11
* @version 1.0
*/
-OH_Drawing_Range* OH_Drawing_TypographyGetWordBoundary(OH_Drawing_Typography*, size_t);
+OH_Drawing_Range* OH_Drawing_TypographyGetWordBoundary(OH_Drawing_Typography* typography, size_t offset);
/**
* @brief Gets start from range.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Range Indicates the pointer to an OH_Drawing_Range object.
+ * @param range Indicates the pointer to an OH_Drawing_Range object.
* @return Returns start from range.
* @since 11
* @version 1.0
*/
-size_t OH_Drawing_GetStartFromRange(OH_Drawing_Range*);
+size_t OH_Drawing_GetStartFromRange(OH_Drawing_Range* range);
/**
* @brief Gets end from range.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Range Indicates the pointer to an OH_Drawing_Range object.
+ * @param range Indicates the pointer to an OH_Drawing_Range object.
* @return Returns end from range.
* @since 11
* @version 1.0
*/
-size_t OH_Drawing_GetEndFromRange(OH_Drawing_Range*);
+size_t OH_Drawing_GetEndFromRange(OH_Drawing_Range* range);
/**
* @brief Gets the line count.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
* @return Returns the line count.
* @since 11
* @version 1.0
*/
-size_t OH_Drawing_TypographyGetLineCount(OH_Drawing_Typography*);
+size_t OH_Drawing_TypographyGetLineCount(OH_Drawing_Typography* typography);
/**
* @brief Sets the decoration style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param int Indicates the text decoration style to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param decorationStyle Indicates the text decoration style to set.
* For details, see the enum OH_Drawing_TextDecorationStyle.
* @since 11
* @version 1.0
*/
-void OH_Drawing_SetTextStyleDecorationStyle(OH_Drawing_TextStyle*, int);
+void OH_Drawing_SetTextStyleDecorationStyle(OH_Drawing_TextStyle* style, int decorationStyle);
/**
* @brief Sets the decoration thickness scale.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param double Indicates the thickness scale of text decoration to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param decorationThicknessScale Indicates the thickness scale of text decoration to set.
* @since 11
* @version 1.0
*/
-void OH_Drawing_SetTextStyleDecorationThicknessScale(OH_Drawing_TextStyle*, double);
+void OH_Drawing_SetTextStyleDecorationThicknessScale(OH_Drawing_TextStyle* style, double decorationThicknessScale);
/**
* @brief Sets the letter spacing.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param double Indicates the letter space to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param letterSpacing Indicates the letter space to set.
* @since 11
* @version 1.0
*/
-void OH_Drawing_SetTextStyleLetterSpacing(OH_Drawing_TextStyle*, double);
+void OH_Drawing_SetTextStyleLetterSpacing(OH_Drawing_TextStyle* style, double letterSpacing);
/**
* @brief Sets the word spacing.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param double Indicates the word space to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param wordSpacing Indicates the word space to set.
* @since 11
* @version 1.0
*/
-void OH_Drawing_SetTextStyleWordSpacing(OH_Drawing_TextStyle*, double);
+void OH_Drawing_SetTextStyleWordSpacing(OH_Drawing_TextStyle* style, double wordSpacing);
/**
* @brief Sets the half leading.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param bool Indicates the half leading to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param halfLeading Indicates the half leading to set.
* @since 11
* @version 1.0
*/
-void OH_Drawing_SetTextStyleHalfLeading(OH_Drawing_TextStyle*, bool);
+void OH_Drawing_SetTextStyleHalfLeading(OH_Drawing_TextStyle* style, bool halfLeading);
/**
* @brief Sets the ellipsis.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param char* Indicates the pointer to ellipsis style.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param ellipsis Indicates the pointer to ellipsis style.
* @since 11
* @version 1.0
*/
-void OH_Drawing_SetTextStyleEllipsis(OH_Drawing_TextStyle*, const char*);
+void OH_Drawing_SetTextStyleEllipsis(OH_Drawing_TextStyle* style, const char* ellipsis);
/**
* @brief Sets the ellipsis modal.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param int Indicates the ellipsis model to set. For details, see the enum OH_Drawing_EllipsisModal.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param ellipsisModal Indicates the ellipsis model to set. For details, see the enum OH_Drawing_EllipsisModal.
* @since 11
* @version 1.0
*/
-void OH_Drawing_SetTextStyleEllipsisModal(OH_Drawing_TextStyle*, int);
+void OH_Drawing_SetTextStyleEllipsisModal(OH_Drawing_TextStyle* style, int ellipsisModal);
/**
* @brief Sets the break strategy.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
- * @param int Indicates the break strategy to set. For details, see the enum OH_Drawing_BreakStrategy.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param breakStrategy Indicates the break strategy to set. For details, see the enum OH_Drawing_BreakStrategy.
* @since 11
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextBreakStrategy(OH_Drawing_TypographyStyle*, int);
+void OH_Drawing_SetTypographyTextBreakStrategy(OH_Drawing_TypographyStyle* style, int breakStrategy);
/**
* @brief Sets the word break type.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
- * @param int Indicates the word break type to set. For details, see the enum OH_Drawing_WordBreakType.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param wordBreakType Indicates the word break type to set. For details, see the enum OH_Drawing_WordBreakType.
* @since 11
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextWordBreakType(OH_Drawing_TypographyStyle*, int);
+void OH_Drawing_SetTypographyTextWordBreakType(OH_Drawing_TypographyStyle* style, int wordBreakType);
/**
* @brief Sets the ellipsis modal.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
- * @param int Indicates the ellipsis modal to set. For details, see the enum OH_Drawing_EllipsisModal.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param ellipsisModal Indicates the ellipsis modal to set. For details, see the enum OH_Drawing_EllipsisModal.
* @since 11
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextEllipsisModal(OH_Drawing_TypographyStyle*, int);
+void OH_Drawing_SetTypographyTextEllipsisModal(OH_Drawing_TypographyStyle* style, int ellipsisModal);
/**
* @brief get line height.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
- * @param int Indicates the line number.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param lineNumber Indicates the line number.
* @return Returns line height.
* @since 11
* @version 1.0
*/
-double OH_Drawing_TypographyGetLineHeight(OH_Drawing_Typography*, int);
+double OH_Drawing_TypographyGetLineHeight(OH_Drawing_Typography* typography, int lineNumber);
/**
* @brief get line width.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
- * @param int Indicates the line number.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param lineNumber Indicates the line number.
* @return Returns line width.
* @since 11
* @version 1.0
*/
-double OH_Drawing_TypographyGetLineWidth(OH_Drawing_Typography*, int);
+double OH_Drawing_TypographyGetLineWidth(OH_Drawing_Typography* typography, int lineNumber);
/**
* @brief get line text range.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to an OH_Drawing_Typography object.
- * @param int Indicates the line number.
- * @param bool Indicates whether spaces are contained.
+ * @param typography Indicates the pointer to an OH_Drawing_Typography object.
+ * @param lineNumber Indicates the line number.
+ * @param includeSpaces Indicates whether spaces are contained.
* @return Returns line text range.
* @since 12
* @version 1.0
*/
-OH_Drawing_Range* OH_Drawing_TypographyGetLineTextRange(OH_Drawing_Typography*, int, bool);
+OH_Drawing_Range* OH_Drawing_TypographyGetLineTextRange(OH_Drawing_Typography* typography,
+ int lineNumber, bool includeSpaces);
/**
* @brief Creates an OH_Drawing_FontDescriptor object.
@@ -1470,11 +1515,11 @@ OH_Drawing_FontDescriptor* OH_Drawing_CreateFontDescriptor(void);
* @brief Releases the memory occupied by an OH_Drawing_FontDescriptor object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontDescriptor the pointer to the font descriptor object OH_Drawing_FontDescriptor.
+ * @param descriptor the pointer to the font descriptor object OH_Drawing_FontDescriptor.
* @since 12
* @version 1.0
*/
-void OH_Drawing_DestroyFontDescriptor(OH_Drawing_FontDescriptor*);
+void OH_Drawing_DestroyFontDescriptor(OH_Drawing_FontDescriptor* descriptor);
/**
* @brief Creates an OH_Drawing_FontParser object.
@@ -1490,401 +1535,405 @@ OH_Drawing_FontParser* OH_Drawing_CreateFontParser(void);
* @brief Releases the memory occupied by an OH_Drawing_FontParser object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontParser Indicates the pointer to the font parser object OH_Drawing_FontParser.
+ * @param parser Indicates the pointer to the font parser object OH_Drawing_FontParser.
* @since 12
* @version 1.0
*/
-void OH_Drawing_DestroyFontParser(OH_Drawing_FontParser*);
+void OH_Drawing_DestroyFontParser(OH_Drawing_FontParser* parser);
/**
* @brief Gets a list of system font names.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontParser Indicates the pointer to the font parser object OH_Drawing_FontParser.
- * @param size_t Returns the number of obtained system font names.
+ * @param fontParser Indicates the pointer to the font parser object OH_Drawing_FontParser.
+ * @param num Returns the number of obtained system font names.
* @return Returns a list of obtained system fonts.
* @since 12
* @version 1.0
*/
-char** OH_Drawing_FontParserGetSystemFontList(OH_Drawing_FontParser*, size_t*);
+char** OH_Drawing_FontParserGetSystemFontList(OH_Drawing_FontParser* fontParser, size_t* num);
/**
* @brief Releases the memory occupied by a list of system font names.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param char** Indicates the pointer to a list of system font names.
- * @param size_t The number of obtained system font names.
+ * @param fontList Indicates the pointer to a list of system font names.
+ * @param num The number of obtained system font names.
* @since 12
* @version 1.0
*/
-void OH_Drawing_DestroySystemFontList(char**, size_t);
+void OH_Drawing_DestroySystemFontList(char** fontList, size_t num);
/**
* @brief Gets information about the system font by font name.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontParser Indicates the pointer to the font parser object OH_Drawing_FontParser.
- * @param char** font name.
+ * @param fontParser Indicates the pointer to the font parser object OH_Drawing_FontParser.
+ * @param name font name.
* @return Returns system fonts information.
* @since 12
* @version 1.0
*/
-OH_Drawing_FontDescriptor* OH_Drawing_FontParserGetFontByName(OH_Drawing_FontParser*, const char*);
+OH_Drawing_FontDescriptor* OH_Drawing_FontParserGetFontByName(OH_Drawing_FontParser* fontParser, const char* name);
/**
* @brief Get line metrics information.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to a typography object OH_Drawing_Typography.
+ * @param typography Indicates the pointer to a typography object OH_Drawing_Typography.
* @return Indicates the pointer to a line metrics object OH_Drawing_LineMetrics.
* @since 12
* @version 1.0
*/
-OH_Drawing_LineMetrics* OH_Drawing_TypographyGetLineMetrics(OH_Drawing_Typography*);
+OH_Drawing_LineMetrics* OH_Drawing_TypographyGetLineMetrics(OH_Drawing_Typography* typography);
/**
* @brief Get the number of lines.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_LineMetrics Indicates the pointer to a line metrics object OH_Drawing_LineMetrics.
+ * @param lineMetrics Indicates the pointer to a line metrics object OH_Drawing_LineMetrics.
* @return Returns the number of lines.
* @since 12
* @version 1.0
*/
-size_t OH_Drawing_LineMetricsGetSize(OH_Drawing_LineMetrics*);
+size_t OH_Drawing_LineMetricsGetSize(OH_Drawing_LineMetrics* lineMetrics);
/**
* @brief Releases the memory occupied by line metrics.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_LineMetrics Indicates the pointer to a line metrics object OH_Drawing_LineMetrics.
+ * @param lineMetrics Indicates the pointer to a line metrics object OH_Drawing_LineMetrics.
* @since 12
* @version 1.0
*/
-void OH_Drawing_DestroyLineMetrics(OH_Drawing_LineMetrics*);
+void OH_Drawing_DestroyLineMetrics(OH_Drawing_LineMetrics* lineMetrics);
/**
* @brief Gets the specified line by line number.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to a typography object OH_Drawing_Typography.
- * @param int Line number.
- * @param OH_Drawing_LineMetrics Indicates the pointer to a line metrics object OH_Drawing_LineMetrics.
+ * @param typography Indicates the pointer to a typography object OH_Drawing_Typography.
+ * @param lineNumber Line number.
+ * @param lineMetric Indicates the pointer to a line metrics object OH_Drawing_LineMetrics.
* @return Whether the line metrics was obtained.
* @since 12
* @version 1.0
*/
-bool OH_Drawing_TypographyGetLineMetricsAt(OH_Drawing_Typography*, int, OH_Drawing_LineMetrics*);
+bool OH_Drawing_TypographyGetLineMetricsAt(OH_Drawing_Typography* typography,
+ int lineNumber, OH_Drawing_LineMetrics* lineMetric);
/**
* @brief Sets the ellipsis of lines in a text file.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to a typography object OH_Drawing_Typography.
- * @param char Indicates the line textellipsis.
+ * @param style Indicates the pointer to a typography object OH_Drawing_Typography.
+ * @param ellipsis Indicates the line textellipsis.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextEllipsis(OH_Drawing_TypographyStyle*, const char*);
+void OH_Drawing_SetTypographyTextEllipsis(OH_Drawing_TypographyStyle* style, const char* ellipsis);
/**
* @brief Sets the locale of lines in a text file.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param char Indicates the pointer to the locale to set.
+ * @param locale Indicates the pointer to the locale to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextLocale(OH_Drawing_TypographyStyle*, const char*);
+void OH_Drawing_SetTypographyTextLocale(OH_Drawing_TypographyStyle* style, const char* locale);
/**
* @brief Sets the textSplitRatio of lines in a text file.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param float Indicates the textSplitRatio of lines to set.
+ * @param textSplitRatio Indicates the textSplitRatio of lines to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextSplitRatio(OH_Drawing_TypographyStyle*, float);
+void OH_Drawing_SetTypographyTextSplitRatio(OH_Drawing_TypographyStyle* style, float textSplitRatio);
/**
* @brief Gets the TextStyle of lines in a text file.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Returns line text textstyle.
* @since 12
* @version 1.0
*/
-OH_Drawing_TextStyle* OH_Drawing_TypographyGetTextStyle(OH_Drawing_TypographyStyle*);
+OH_Drawing_TextStyle* OH_Drawing_TypographyGetTextStyle(OH_Drawing_TypographyStyle* style);
/**
* @brief Gets the EffectiveAlign of lines in a text file.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Returns line text align.
* @since 12
* @version 1.0
*/
-int OH_Drawing_TypographyGetEffectiveAlignment(OH_Drawing_TypographyStyle*);
+int OH_Drawing_TypographyGetEffectiveAlignment(OH_Drawing_TypographyStyle* style);
/**
* @brief Gets the UnlimitedLines of lines in a text file.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Returns whether the text has a maximum line limit,
* with true indicating a maximum line limit and false indicating no maximum line limit.
* @since 12
* @version 1.0
*/
-bool OH_Drawing_TypographyIsLineUnlimited(OH_Drawing_TypographyStyle*);
+bool OH_Drawing_TypographyIsLineUnlimited(OH_Drawing_TypographyStyle* style);
/**
* @brief Gets the IsEllipsized of lines in a text file.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Returns whether the text has ellipsis,
* true meaning there is an ellipsis and false meaning there is no ellipsis.
* @since 12
* @version 1.0
*/
-bool OH_Drawing_TypographyIsEllipsized(OH_Drawing_TypographyStyle*);
+bool OH_Drawing_TypographyIsEllipsized(OH_Drawing_TypographyStyle* style);
/**
* @brief set line textstyle.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param handler Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextStyle(OH_Drawing_TypographyStyle*, OH_Drawing_TextStyle*);
+void OH_Drawing_SetTypographyTextStyle(OH_Drawing_TypographyStyle* handler, OH_Drawing_TextStyle* style);
/**
* @brief get line fontmetrics.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to a typography object OH_Drawing_Typography.
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
- * @param OH_Drawing_Font_Metrics Indicates the pointer to a font metrics object OH_Drawing_Font_Metrics.
+ * @param typography Indicates the pointer to a typography object OH_Drawing_Typography.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param fontmetrics Indicates the pointer to a font metrics object OH_Drawing_Font_Metrics.
* @return Whether the font metrics was obtained.
* @since 12
* @version 1.0
*/
-bool OH_Drawing_TextStyleGetFontMetrics(OH_Drawing_Typography*, OH_Drawing_TextStyle*, OH_Drawing_Font_Metrics*);
+bool OH_Drawing_TextStyleGetFontMetrics(OH_Drawing_Typography* typography,
+ OH_Drawing_TextStyle* style, OH_Drawing_Font_Metrics* fontmetrics);
/**
* @brief Gets the position of the specified line or the first text of the specified line.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to a typography object OH_Drawing_Typography.
- * @param int Line number.
- * @param bool True is the information for the whole line, and false is the information to get the first character
- * @param bool Whether the text width contains whitespace.
- * @param OH_Drawing_LineMetrics Indicates the pointer to a line metrics object OH_Drawing_LineMetrics.
+ * @param typography Indicates the pointer to a typography object OH_Drawing_Typography.
+ * @param lineNumber Line number.
+ * @param oneLine True is the information for the whole line, and false is the information to get the first character
+ * @param includeWhitespace Whether the text width contains whitespace.
+ * @param drawingLineMetrics Indicates the pointer to a line metrics object OH_Drawing_LineMetrics.
* @return return whether the information was successfully fetched.
* @since 12
* @version 1.0
*/
-bool OH_Drawing_TypographyGetLineInfo(OH_Drawing_Typography*, int, bool, bool, OH_Drawing_LineMetrics*);
+bool OH_Drawing_TypographyGetLineInfo(OH_Drawing_Typography* typography, int lineNumber, bool oneLine,
+ bool includeWhitespace, OH_Drawing_LineMetrics* drawingLineMetrics);
/**
* @brief Sets the font weight of text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param int Indicates the font weight of text typography to set. For details,
+ * @param weight Indicates the font weight of text typography to set. For details,
* see the enum OH_Drawing_FontWeight.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextFontWeight(OH_Drawing_TypographyStyle*, int);
+void OH_Drawing_SetTypographyTextFontWeight(OH_Drawing_TypographyStyle* style, int weight);
/**
* @brief Sets the font style of text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param int Indicates the font style of text typography to set. For details,
+ * @param fontStyle Indicates the font style of text typography to set. For details,
* see the enum OH_Drawing_FontStyle.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextFontStyle(OH_Drawing_TypographyStyle*, int);
+void OH_Drawing_SetTypographyTextFontStyle(OH_Drawing_TypographyStyle* style, int fontStyle);
/**
* @brief Sets the font family of text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param char Indicates the pointer to the font family of text typography to set.
+ * @param fontFamily Indicates the pointer to the font family of text typography to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextFontFamily(OH_Drawing_TypographyStyle*, const char*);
+void OH_Drawing_SetTypographyTextFontFamily(OH_Drawing_TypographyStyle* style, const char* fontFamily);
/**
* @brief Sets the font size of text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param double Indicates the font size of text typography to set.
+ * @param fontSize Indicates the font size of text typography to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextFontSize(OH_Drawing_TypographyStyle*, double);
+void OH_Drawing_SetTypographyTextFontSize(OH_Drawing_TypographyStyle* style, double fontSize);
/**
* @brief Sets the font height of text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param double Indicates the font height of text typography to set.
+ * @param fontHeight Indicates the font height of text typography to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextFontHeight(OH_Drawing_TypographyStyle*, double);
+void OH_Drawing_SetTypographyTextFontHeight(OH_Drawing_TypographyStyle* style, double fontHeight);
/**
* @brief Sets the half leading of text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param bool Indicates the half leading of text typography to set.
+ * @param halfLeading Indicates the half leading of text typography to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextHalfLeading(OH_Drawing_TypographyStyle*, bool);
+void OH_Drawing_SetTypographyTextHalfLeading(OH_Drawing_TypographyStyle* style, bool halfLeading);
/**
* @brief Sets whether to enable line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param bool Indicates whether the line style for text typography is used.
+ * @param useLineStyle Indicates whether the line style for text typography is used.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextUseLineStyle(OH_Drawing_TypographyStyle*, bool);
+void OH_Drawing_SetTypographyTextUseLineStyle(OH_Drawing_TypographyStyle* style, bool useLineStyle);
/**
* @brief Sets the font weight of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param int Indicates the font weight of line style for text typography to set.
+ * @param weight Indicates the font weight of line style for text typography to set.
* For details, see the enum OH_Drawing_FontWeight.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextLineStyleFontWeight(OH_Drawing_TypographyStyle*, int);
+void OH_Drawing_SetTypographyTextLineStyleFontWeight(OH_Drawing_TypographyStyle* style, int weight);
/**
* @brief Sets the font style of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param int Indicates the font style of line style for text typography to set. For details,
+ * @param fontStyle Indicates the font style of line style for text typography to set. For details,
* see the enum OH_Drawing_FontStyle.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextLineStyleFontStyle(OH_Drawing_TypographyStyle*, int);
+void OH_Drawing_SetTypographyTextLineStyleFontStyle(OH_Drawing_TypographyStyle* style, int fontStyle);
/**
* @brief Sets the font families of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param int Indicates the number of font families to set.
- * @param char Indicates the pointer to the font families of line style for text typography to set.
+ * @param fontFamiliesNumber Indicates the number of font families to set.
+ * @param fontFamilies Indicates the pointer to the font families of line style for text typography to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextLineStyleFontFamilies(OH_Drawing_TypographyStyle*, int, const char* fontFamilies[]);
+void OH_Drawing_SetTypographyTextLineStyleFontFamilies(OH_Drawing_TypographyStyle* style,
+ int fontFamiliesNumber, const char* fontFamilies[]);
/**
* @brief Sets the font size of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param double Indicates the font size of line style for text typography to set.
+ * @param lineStyleFontSize Indicates the font size of line style for text typography to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextLineStyleFontSize(OH_Drawing_TypographyStyle*, double);
+void OH_Drawing_SetTypographyTextLineStyleFontSize(OH_Drawing_TypographyStyle* style, double lineStyleFontSize);
/**
* @brief Sets the font height of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param double Indicates the font height of line style for text typography to set.
+ * @param lineStyleFontHeight Indicates the font height of line style for text typography to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextLineStyleFontHeight(OH_Drawing_TypographyStyle*, double);
+void OH_Drawing_SetTypographyTextLineStyleFontHeight(OH_Drawing_TypographyStyle* style, double lineStyleFontHeight);
/**
* @brief Sets the half leading of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param bool Indicates the half leading of line for text typography to set.
+ * @param lineStyleHalfLeading Indicates the half leading of line for text typography to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextLineStyleHalfLeading(OH_Drawing_TypographyStyle*, bool);
+void OH_Drawing_SetTypographyTextLineStyleHalfLeading(OH_Drawing_TypographyStyle* style, bool lineStyleHalfLeading);
/**
* @brief Sets the spacing scale of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param double Indicates the space scale of line for text typography to set.
+ * @param spacingScale Indicates the space scale of line for text typography to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextLineStyleSpacingScale(OH_Drawing_TypographyStyle*, double);
+void OH_Drawing_SetTypographyTextLineStyleSpacingScale(OH_Drawing_TypographyStyle* style, double spacingScale);
/**
* @brief Sets whether only line style is enabled for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
- * @param bool Indicates the line style for text typography to set only.
+ * @param lineStyleOnly Indicates the line style for text typography to set only.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyTextLineStyleOnly(OH_Drawing_TypographyStyle*, bool);
+void OH_Drawing_SetTypographyTextLineStyleOnly(OH_Drawing_TypographyStyle* style, bool lineStyleOnly);
/**
* @brief Creates an OH_Drawing_TextShadow object.
@@ -1900,304 +1949,307 @@ OH_Drawing_TextShadow* OH_Drawing_CreateTextShadow(void);
* @brief Releases the memory occupied by the text shadow object OH_Drawing_TextShadow.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextShadow Indicates the pointer to the text shadow object OH_Drawing_TextShadow.
+ * @param shadow Indicates the pointer to the text shadow object OH_Drawing_TextShadow.
* @since 12
* @version 1.0
*/
-void OH_Drawing_DestroyTextShadow(OH_Drawing_TextShadow*);
+void OH_Drawing_DestroyTextShadow(OH_Drawing_TextShadow* shadow);
/**
* @brief Gets the vector of TextShadow in TextStyle.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
* @param int Indicates the number in vector to set.
- * @param OH_Drawing_TextShadow Indicates the pointer to the text shadow object OH_Drawing_TextShadow.
+ * @param style Indicates the pointer to the text shadow object OH_Drawing_TextShadow.
* @return Returns the vector of TextShadow.
* @since 12
* @version 1.0
*/
-OH_Drawing_TextShadow* OH_Drawing_TextStyleGetShadows(OH_Drawing_TextStyle*);
+OH_Drawing_TextShadow* OH_Drawing_TextStyleGetShadows(OH_Drawing_TextStyle* style);
/**
* @brief Gets the size of vector of TextShadow in TextStyle.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
* @return Returns the size of vector.
* @since 12
* @version 1.0
*/
-int OH_Drawing_TextStyleGetShadowCount(OH_Drawing_TextStyle*);
+int OH_Drawing_TextStyleGetShadowCount(OH_Drawing_TextStyle* style);
/**
* @brief Adds element in vector of TextShadow in TextStyle.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
- * @param OH_Drawing_TextShadow Indicates the pointer to the text shadow object OH_Drawing_TextShadow.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param shadow Indicates the pointer to the text shadow object OH_Drawing_TextShadow.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleAddShadow(OH_Drawing_TextStyle*, const OH_Drawing_TextShadow*);
+void OH_Drawing_TextStyleAddShadow(OH_Drawing_TextStyle* style, const OH_Drawing_TextShadow* shadow);
/**
* @brief clear elements in vector of TextShadow in TextStyle.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleClearShadows(OH_Drawing_TextStyle*);
+void OH_Drawing_TextStyleClearShadows(OH_Drawing_TextStyle* style);
/**
* @brief Gets element in vector of TextShadow with index.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to a text style object OH_Drawing_TextStyle.
- * @param int Indicates the index to set.
+ * @param style Indicates the pointer to a text style object OH_Drawing_TextStyle.
+ * @param index Indicates the index to set.
* @return Returns the pointer to element with the index in vector of the text style object
* OH_Drawing_TextStyle.
* @since 12
* @version 1.0
*/
-OH_Drawing_TextShadow* OH_Drawing_TextStyleGetShadowWithIndex(OH_Drawing_TextStyle*, int);
+OH_Drawing_TextShadow* OH_Drawing_TextStyleGetShadowWithIndex(OH_Drawing_TextStyle* style, int index);
/**
* @brief Set indents of the typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to a typography object OH_Drawing_Typography.
- * @param float Indicates the pointer to the indents to set.
+ * @param typography Indicates the pointer to a typography object OH_Drawing_Typography.
+ * @param indentsNumber Indicates the pointer to the indents to set.
+ * @param indents Indicates the pointer to the indents to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TypographySetIndents(OH_Drawing_Typography*, int, const float indents[]);
+void OH_Drawing_TypographySetIndents(OH_Drawing_Typography* typography, int indentsNumber, const float indents[]);
/**
* @brief Gets element with index in vector of Indents.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to a typography object OH_Drawing_Typography.
- * @param int Indicates the index to set.
+ * @param typography Indicates the pointer to a typography object OH_Drawing_Typography.
+ * @param index Indicates the index to set.
* @return float Indicates the element with the index in vector of Indents.
* @since 12
* @version 1.0
*/
-float OH_Drawing_TypographyGetIndentsWithIndex(OH_Drawing_Typography*, int);
+float OH_Drawing_TypographyGetIndentsWithIndex(OH_Drawing_Typography* typography, int index);
/**
* @brief Releases the memory occupied by vector with the text shadow object OH_Drawing_TextShadow.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param Indicates the pointer to the text shadow object OH_Drawing_TextShadow.
+ * @param shadow the pointer to the text shadow object OH_Drawing_TextShadow.
* @since 12
* @version 1.0
*/
-void OH_Drawing_DestroyTextShadows(OH_Drawing_TextShadow*);
+void OH_Drawing_DestroyTextShadows(OH_Drawing_TextShadow* shadow);
/**
* @brief Set mode of applying the leading over and under text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
* @param heightMode Indicates the mode to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TypographyTextSetHeightBehavior(OH_Drawing_TypographyStyle*, OH_Drawing_TextHeightBehavior heightMode);
+void OH_Drawing_TypographyTextSetHeightBehavior(OH_Drawing_TypographyStyle* style,
+ OH_Drawing_TextHeightBehavior heightMode);
/**
* @brief Get mode of applying the leading over and under text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
* @return Returns the mode.
* @since 12
* @version 1.0
*/
-OH_Drawing_TextHeightBehavior OH_Drawing_TypographyTextGetHeightBehavior(OH_Drawing_TypographyStyle*);
+OH_Drawing_TextHeightBehavior OH_Drawing_TypographyTextGetHeightBehavior(OH_Drawing_TypographyStyle* style);
/**
* @brief Set struct of background rect and styleId of text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param OH_Drawing_RectStyle_Info Indicates the pointer to an OH_Drawing_RectStyle_Info object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param rectStyleInfo Indicates the pointer to an OH_Drawing_RectStyle_Info object.
* @param styleId Indicates the styleId of text to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleSetBackgroundRect(OH_Drawing_TextStyle*, const OH_Drawing_RectStyle_Info*, int styleId);
+void OH_Drawing_TextStyleSetBackgroundRect(OH_Drawing_TextStyle* style,
+ const OH_Drawing_RectStyle_Info* rectStyleInfo, int styleId);
/**
* @brief Add symbols in creating typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyCreate Indicates the pointer to an OH_Drawing_TypographyCreate object.
+ * @param handler Indicates the pointer to an OH_Drawing_TypographyCreate object.
* @param symbol Indicates the symbol to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TypographyHandlerAddSymbol(OH_Drawing_TypographyCreate*, uint32_t symbol);
+void OH_Drawing_TypographyHandlerAddSymbol(OH_Drawing_TypographyCreate* handler, uint32_t symbol);
/**
* @brief Add font feature.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @param tag Indicates the pointer to the tag to set.
* @param value Indicates the value to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleAddFontFeature(OH_Drawing_TextStyle*, const char* tag, int value);
+void OH_Drawing_TextStyleAddFontFeature(OH_Drawing_TextStyle* style, const char* tag, int value);
/**
* @brief Add font variation.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param char* Indicates the pointer to font variation axis.
- * @param float Indicates the font variation value to set.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param axis Indicates the pointer to font variation axis.
+ * @param value Indicates the font variation value to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleAddFontVariation(OH_Drawing_TextStyle*, const char* /* axis */, const float /* value */);
+void OH_Drawing_TextStyleAddFontVariation(OH_Drawing_TextStyle* style, const char* axis, const float value);
/**
* @brief Get all font features.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return OH_Drawing_FontFeature Indicates the pointer to an array of structures of OH_Drawing_FontFeature.
* Get size of font feature by OH_Drawing_TextStyleGetFontFeatureSize.
* @since 12
* @version 1.0
*/
-OH_Drawing_FontFeature* OH_Drawing_TextStyleGetFontFeatures(OH_Drawing_TextStyle*);
+OH_Drawing_FontFeature* OH_Drawing_TextStyleGetFontFeatures(OH_Drawing_TextStyle* style);
/**
* @brief Release the memory occupied by array of structures of font features.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontFeature Indicates the pointer to an array of structures of OH_Drawing_FontFeature.
+ * @param fontFeature Indicates the pointer to an array of structures of OH_Drawing_FontFeature.
* @param fontFeatureSize Indicates the size of array of structures of OH_Drawing_FontFeature.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleDestroyFontFeatures(OH_Drawing_FontFeature*, size_t fontFeatureSize);
+void OH_Drawing_TextStyleDestroyFontFeatures(OH_Drawing_FontFeature* fontFeature, size_t fontFeatureSize);
/**
* @brief Get size of font features.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns the size of fontfeatures map.
* @since 12
* @version 1.0
*/
-size_t OH_Drawing_TextStyleGetFontFeatureSize(OH_Drawing_TextStyle*);
+size_t OH_Drawing_TextStyleGetFontFeatureSize(OH_Drawing_TextStyle* style);
/**
* @brief Clear font features.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleClearFontFeature(OH_Drawing_TextStyle*);
+void OH_Drawing_TextStyleClearFontFeature(OH_Drawing_TextStyle* style);
/**
* @brief Set baseline shift of text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @param lineShift Indicates the baseline shift to set.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TextStyleSetBaselineShift(OH_Drawing_TextStyle*, double lineShift);
+void OH_Drawing_TextStyleSetBaselineShift(OH_Drawing_TextStyle* style, double lineShift);
/**
* @brief Get baseline shift of text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns the baseline shift.
* @since 12
* @version 1.0
*/
-double OH_Drawing_TextStyleGetBaselineShift(OH_Drawing_TextStyle*);
+double OH_Drawing_TextStyleGetBaselineShift(OH_Drawing_TextStyle* style);
/**
* @brief Gets the text color.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns the text color.
* @since 12
* @version 1.0
*/
-uint32_t OH_Drawing_TextStyleGetColor(OH_Drawing_TextStyle*);
+uint32_t OH_Drawing_TextStyleGetColor(OH_Drawing_TextStyle* style);
/**
* @brief Gets text decoration style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns text decoration style.
* @since 12
* @version 1.0
*/
-OH_Drawing_TextDecorationStyle OH_Drawing_TextStyleGetDecorationStyle(OH_Drawing_TextStyle*);
+OH_Drawing_TextDecorationStyle OH_Drawing_TextStyleGetDecorationStyle(OH_Drawing_TextStyle* style);
/**
* @brief Gets font weight.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns font Weight.
* @since 12
* @version 1.0
*/
-OH_Drawing_FontWeight OH_Drawing_TextStyleGetFontWeight(OH_Drawing_TextStyle*);
+OH_Drawing_FontWeight OH_Drawing_TextStyleGetFontWeight(OH_Drawing_TextStyle* style);
/**
* @brief Gets font style.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns font style.
* @since 12
* @version 1.0
*/
-OH_Drawing_FontStyle OH_Drawing_TextStyleGetFontStyle(OH_Drawing_TextStyle*);
+OH_Drawing_FontStyle OH_Drawing_TextStyleGetFontStyle(OH_Drawing_TextStyle* style);
/**
* @brief Gets the font baseline.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns the font baseline.
* @since 12
* @version 1.0
*/
-OH_Drawing_TextBaseline OH_Drawing_TextStyleGetBaseline(OH_Drawing_TextStyle*);
+OH_Drawing_TextBaseline OH_Drawing_TextStyleGetBaseline(OH_Drawing_TextStyle* style);
/**
* @brief Gets a list of font families.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @param num Indicates count of font families result.
* @return Returns a list of font families.
* @since 12
* @version 1.0
*/
-char** OH_Drawing_TextStyleGetFontFamilies(OH_Drawing_TextStyle*, size_t* num);
+char** OH_Drawing_TextStyleGetFontFamilies(OH_Drawing_TextStyle* style, size_t* num);
/**
* @brief Releases the memory occupied by a list of font families.
@@ -2214,76 +2266,76 @@ void OH_Drawing_TextStyleDestroyFontFamilies(char** fontFamilies, size_t num);
* @brief Gets font size.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns font size.
* @since 12
* @version 1.0
*/
-double OH_Drawing_TextStyleGetFontSize(OH_Drawing_TextStyle*);
+double OH_Drawing_TextStyleGetFontSize(OH_Drawing_TextStyle* style);
/**
* @brief Gets the letter spacing of the text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns the size of the letter spacing.
* @since 12
* @version 1.0
*/
-double OH_Drawing_TextStyleGetLetterSpacing(OH_Drawing_TextStyle*);
+double OH_Drawing_TextStyleGetLetterSpacing(OH_Drawing_TextStyle* style);
/**
* @brief Gets the word spacing of the text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns word spacing size.
* @since 12
* @version 1.0
*/
-double OH_Drawing_TextStyleGetWordSpacing(OH_Drawing_TextStyle*);
+double OH_Drawing_TextStyleGetWordSpacing(OH_Drawing_TextStyle* style);
/**
* @brief Gets font height.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns font height.
* @since 12
* @version 1.0
*/
-double OH_Drawing_TextStyleGetFontHeight(OH_Drawing_TextStyle*);
+double OH_Drawing_TextStyleGetFontHeight(OH_Drawing_TextStyle* style);
/**
* @brief Gets whether to set the text to half line spacing.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns true indicates that the spacing takes effect,
* false indicates that the spacing does not take effect.
* @since 12
* @version 1.0
*/
-bool OH_Drawing_TextStyleGetHalfLeading(OH_Drawing_TextStyle*);
+bool OH_Drawing_TextStyleGetHalfLeading(OH_Drawing_TextStyle* style);
/**
* @brief Gets the locale.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns a locale of data type as a pointer to a char. As with the TextStyle lifecycle.
* No release is required and the return value is invalidated after the set method is called.
* @since 12
* @version 1.0
*/
-const char* OH_Drawing_TextStyleGetLocale(OH_Drawing_TextStyle*);
+const char* OH_Drawing_TextStyleGetLocale(OH_Drawing_TextStyle* style);
/**
* @brief Sets the text style, including font weight, font width and font slant.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
- * @param OH_Drawing_FontStyleStruct Indicates an OH_Drawing_FontStyleStruct object.
+ * @param drawingTextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param fontStyle Indicates an OH_Drawing_FontStyleStruct object.
* @since 12
* @version 1.0
*/
@@ -2294,7 +2346,7 @@ void OH_Drawing_SetTextStyleFontStyleStruct(OH_Drawing_TextStyle* drawingTextSty
* @brief Gets the text style, including font weight, font width and font slant.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param drawingTextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Returns the OH_Drawing_FontStyleStruct object getted.
* @since 12
* @version 1.0
@@ -2305,8 +2357,8 @@ OH_Drawing_FontStyleStruct OH_Drawing_TextStyleGetFontStyleStruct(OH_Drawing_Tex
* @brief Sets the typography style, including font weight, font width and font slant.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
- * @param OH_Drawing_FontStyleStruct Indicates an OH_Drawing_FontStyleStruct object.
+ * @param drawingStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param fontStyle Indicates an OH_Drawing_FontStyleStruct object.
* @since 12
* @version 1.0
*/
@@ -2317,7 +2369,7 @@ void OH_Drawing_SetTypographyStyleFontStyleStruct(OH_Drawing_TypographyStyle* dr
* @brief Gets the typography style, including font weight, font width and font slant.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param drawingStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
* @return Returns the OH_Drawing_FontStyleStruct object getted.
* @since 12
* @version 1.0
@@ -2352,9 +2404,9 @@ bool OH_Drawing_TextStyleIsEqualByFont(const OH_Drawing_TextStyle* style, const
* @brief Gets whether two TextStyle objects match attributes
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param textStyleType Indicates enumerates of text style type.
- * @param style Indicates source of comparison OH_Drawing_TextStyle object.
- * @param comparedStyle Indicates comparison OH_Drawing_TextStyle object.
+ * @param style Indicates enumerates of text style type.
+ * @param comparedStyle Indicates source of comparison OH_Drawing_TextStyle object.
+ * @param textStyleType Indicates comparison OH_Drawing_TextStyle object.
* @return Match attributes result.
* @since 12
* @version 1.0
@@ -2366,7 +2418,7 @@ bool OH_Drawing_TextStyleIsAttributeMatched(const OH_Drawing_TextStyle* style,
* @brief Set placeholder of TextStyle.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @since 12
* @version 1.0
*/
@@ -2376,7 +2428,7 @@ void OH_Drawing_TextStyleSetPlaceholder(OH_Drawing_TextStyle* style);
* @brief Gets whether placeholder is enable.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextStyle Indicates the pointer to an OH_Drawing_TextStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TextStyle object.
* @return Whether placeholder is enable.
* @since 12
* @version 1.0
@@ -2387,7 +2439,7 @@ bool OH_Drawing_TextStyleIsPlaceholder(OH_Drawing_TextStyle* style);
* @brief Gets text alignment mode.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
* @return Returns text alignment mode.
* @since 12
* @version 1.0
@@ -2398,7 +2450,7 @@ OH_Drawing_TextAlign OH_Drawing_TypographyStyleGetEffectiveAlignment(OH_Drawing_
* @brief Gets whether the hinting is enabled.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
* @return True, if the hinting takes effect; False, if the hinting does not take effect.
* @since 12
* @version 1.0
@@ -2409,7 +2461,7 @@ bool OH_Drawing_TypographyStyleIsHintEnabled(OH_Drawing_TypographyStyle* style);
* @brief Gets system font configuration information.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontConfigInfoErrorCode Indicates error code returned, based on the error code to
+ * @param errorCode Indicates error code returned, based on the error code to
* release the memory of system font configuration information.
* For details, see the enum OH_Drawing_FontConfigInfoErrorCode.
* @return Returns a pointer to system font configuration information.
@@ -2417,49 +2469,49 @@ bool OH_Drawing_TypographyStyleIsHintEnabled(OH_Drawing_TypographyStyle* style);
* @since 12
* @version 1.0
*/
-OH_Drawing_FontConfigInfo* OH_Drawing_GetSystemFontConfigInfo(OH_Drawing_FontConfigInfoErrorCode*);
+OH_Drawing_FontConfigInfo* OH_Drawing_GetSystemFontConfigInfo(OH_Drawing_FontConfigInfoErrorCode* errorCode);
/**
* @brief Releases the memory occupied by system font configuration information.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_FontConfigInfo Indicates the pointer to an OH_Drawing_FontConfigInfo object.
+ * @param drawFontCfgInfo Indicates the pointer to an OH_Drawing_FontConfigInfo object.
* @since 12
* @version 1.0
*/
-void OH_Drawing_DestroySystemFontConfigInfo(OH_Drawing_FontConfigInfo*);
+void OH_Drawing_DestroySystemFontConfigInfo(OH_Drawing_FontConfigInfo* drawFontCfgInfo);
/**
* @brief Sets the strut style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
- * @param OH_Drawing_StrutStyle Indicates the pointer of OH_Drawing_StrutStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param strutstyle Indicates the pointer of OH_Drawing_StrutStyle object.
* @since 12
* @version 1.0
*/
-void OH_Drawing_SetTypographyStyleTextStrutStyle(OH_Drawing_TypographyStyle*, OH_Drawing_StrutStyle*);
+void OH_Drawing_SetTypographyStyleTextStrutStyle(OH_Drawing_TypographyStyle* style, OH_Drawing_StrutStyle* strutstyle);
/**
* @brief Releases the memory occupied by an OH_Drawing_StrutStyle object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_StrutStyle Indicates the pointer of OH_Drawing_StrutStyle object.
+ * @param strutstyle Indicates the pointer of OH_Drawing_StrutStyle object.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TypographyStyleDestroyStrutStyle(OH_Drawing_StrutStyle*);
+void OH_Drawing_TypographyStyleDestroyStrutStyle(OH_Drawing_StrutStyle* strutstyle);
/**
* @brief Gets the strut style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
* @return Returns the pointer of OH_Drawing_StrutStyle object.
* @since 12
* @version 1.0
*/
-OH_Drawing_StrutStyle* OH_Drawing_TypographyStyleGetStrutStyle(OH_Drawing_TypographyStyle*);
+OH_Drawing_StrutStyle* OH_Drawing_TypographyStyleGetStrutStyle(OH_Drawing_TypographyStyle* style);
/**
* @brief Overriding the struct StrutStyle equals operator.
@@ -2476,119 +2528,120 @@ bool OH_Drawing_TypographyStyleStrutStyleEquals(OH_Drawing_StrutStyle* from, OH_
* @brief Sets the hinting of text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
* @param hintsEnabled Indicates the hinting of text typography..
* @since 12
* @version 1.0
*/
void OH_Drawing_TypographyStyleSetHintsEnabled(OH_Drawing_TypographyStyle* style, bool hintsEnabled);
-/* @brief Getting all font metrics from target row.
+/**
+ * @brief Getting all font metrics from target row.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates a pointer to a typesetting object.
+ * @param typography Indicates a pointer to a typesetting object.
* @param lineNumber Indicates specifies the number of rows.
* @param fontMetricsSize Indicates the return size of font metrics struct from current line.
* @return Returns all character measures for the current row.
* @since 12
* @version 1.0
*/
-OH_Drawing_Font_Metrics* OH_Drawing_TypographyGetLineFontMetrics(OH_Drawing_Typography*,
+OH_Drawing_Font_Metrics* OH_Drawing_TypographyGetLineFontMetrics(OH_Drawing_Typography* typography,
size_t lineNumber, size_t* fontMetricsSize);
/**
* @brief Free up all the space taken up by the lineFontMetric.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Font_Metrics Indicates the first address of the lineFontMetric gather to be destroyed.
+ * @param lineFontMetric Indicates the first address of the lineFontMetric gather to be destroyed.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TypographyDestroyLineFontMetrics(OH_Drawing_Font_Metrics*);
+void OH_Drawing_TypographyDestroyLineFontMetrics(OH_Drawing_Font_Metrics* lineFontMetric);
/**
* @brief Mark the Typography as dirty, and initially state the Typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to the text OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to the text OH_Drawing_Typography object.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TypographyMarkDirty(OH_Drawing_Typography*);
+void OH_Drawing_TypographyMarkDirty(OH_Drawing_Typography* typography);
/**
* @brief Get the unresolved Glyphs count of lines in a text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to the text OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to the text OH_Drawing_Typography object.
* @return Returns unresolved Glyphs count.
* @since 12
* @version 1.0
*/
-int32_t OH_Drawing_TypographyGetUnresolvedGlyphsCount(OH_Drawing_Typography*);
+int32_t OH_Drawing_TypographyGetUnresolvedGlyphsCount(OH_Drawing_Typography* typography);
/**
* @brief Update the font size of lines in a text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_Typography Indicates the pointer to the text OH_Drawing_Typography object.
+ * @param typography Indicates the pointer to the text OH_Drawing_Typography object.
* @param from Indicates the source of the original font size.
* @param to Indicates the destination of the updated font size.
* @param fontSize Indicates the size of the font.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TypographyUpdateFontSize(OH_Drawing_Typography*, size_t from, size_t to, float fontSize);
+void OH_Drawing_TypographyUpdateFontSize(OH_Drawing_Typography* typography, size_t from, size_t to, float fontSize);
/**
* @brief Get whether the text layout enables line styles.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to the text OH_Drawing_TypographyStyle object.
+ * @param style Indicates the pointer to the text OH_Drawing_TypographyStyle object.
* @return Whether or not to enable line styles in text layout only, true means enable, false means disable.
* @since 12
* @version 1.0
*/
-bool OH_Drawing_TypographyTextGetLineStyle(OH_Drawing_TypographyStyle*);
+bool OH_Drawing_TypographyTextGetLineStyle(OH_Drawing_TypographyStyle* style);
/**
* @brief Get the font weight of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Return the font weight of line style for text typography.
* For details, see the enum OH_Drawing_FontWeight.
* @since 12
* @version 1.0
*/
-OH_Drawing_FontWeight OH_Drawing_TypographyTextlineStyleGetFontWeight(OH_Drawing_TypographyStyle*);
+OH_Drawing_FontWeight OH_Drawing_TypographyTextlineStyleGetFontWeight(OH_Drawing_TypographyStyle* style);
/**
* @brief Get the font style of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Return the font style of line style for text typography.
* For details, see the enum OH_Drawing_FontStyle.
* @since 12
* @version 1.0
*/
-OH_Drawing_FontStyle OH_Drawing_TypographyTextlineStyleGetFontStyle(OH_Drawing_TypographyStyle*);
+OH_Drawing_FontStyle OH_Drawing_TypographyTextlineStyleGetFontStyle(OH_Drawing_TypographyStyle* style);
/**
* @brief Get the font families of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @param num The number of obtained font names.
* @return Return the font families of line style for text typography.
* @since 12
* @version 1.0
*/
-char** OH_Drawing_TypographyTextlineStyleGetFontFamilies(OH_Drawing_TypographyStyle*, size_t* num);
+char** OH_Drawing_TypographyTextlineStyleGetFontFamilies(OH_Drawing_TypographyStyle* style, size_t* num);
/**
* @brief Releases the memory occupied by a list of font families names.
@@ -2605,123 +2658,123 @@ void OH_Drawing_TypographyTextlineStyleDestroyFontFamilies(char** fontFamilies,
* @brief Get the font size of font size for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Return the font size of font size for text typography.
* @since 12
* @version 1.0
*/
-double OH_Drawing_TypographyTextlineStyleGetFontSize(OH_Drawing_TypographyStyle*);
+double OH_Drawing_TypographyTextlineStyleGetFontSize(OH_Drawing_TypographyStyle* style);
/**
* @brief Get the font height scale in text layout.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Retrun the font height scale in text layout.
* @since 12
* @version 1.0
*/
-double OH_Drawing_TypographyTextlineStyleGetHeightScale(OH_Drawing_TypographyStyle*);
+double OH_Drawing_TypographyTextlineStyleGetHeightScale(OH_Drawing_TypographyStyle* style);
/**
* @brief Get whether to enable font height for line styles in text layout only.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Whether or not to enable the font height for line styles in text layout only,
* true means enable, false means disable.
* @since 12
* @version 1.0
*/
-bool OH_Drawing_TypographyTextlineStyleGetHeightOnly(OH_Drawing_TypographyStyle*);
+bool OH_Drawing_TypographyTextlineStyleGetHeightOnly(OH_Drawing_TypographyStyle* style);
/**
* @brief Get the half leading of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Whether to enable the text line half leading style, true means enable, false means disable.
* @since 12
* @version 1.0
*/
-bool OH_Drawing_TypographyTextlineStyleGetHalfLeading(OH_Drawing_TypographyStyle*);
+bool OH_Drawing_TypographyTextlineStyleGetHalfLeading(OH_Drawing_TypographyStyle* style);
/**
* @brief Get the spacing scale of line style for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Return the spacing scale of line style for text typography.
* @since 12
* @version 1.0
*/
-double OH_Drawing_TypographyTextlineStyleGetSpacingScale(OH_Drawing_TypographyStyle*);
+double OH_Drawing_TypographyTextlineStyleGetSpacingScale(OH_Drawing_TypographyStyle* style);
/**
* @brief Get whether only line style is enabled for text typography.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Returns whether only line style is enabled for text layout, true means it is enabled,
* false means it is not.
* @since 12
* @version 1.0
*/
-bool OH_Drawing_TypographyTextlineGetStyleOnly(OH_Drawing_TypographyStyle*);
+bool OH_Drawing_TypographyTextlineGetStyleOnly(OH_Drawing_TypographyStyle* style);
/**
* @brief Get the text alignment mode.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Return the text alignment mode. For details, see the enum OH_Drawing_TextAlign.
* @since 12
* @version 1.0
*/
-OH_Drawing_TextAlign OH_Drawing_TypographyGetTextAlign(OH_Drawing_TypographyStyle*);
+OH_Drawing_TextAlign OH_Drawing_TypographyGetTextAlign(OH_Drawing_TypographyStyle* style);
/**
* @brief Get the text direction.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Return the text direction. For details, see the enum OH_Drawing_TextDirection.
* @since 12
* @version 1.0
*/
-OH_Drawing_TextDirection OH_Drawing_TypographyGetTextDirection(OH_Drawing_TypographyStyle*);
+OH_Drawing_TextDirection OH_Drawing_TypographyGetTextDirection(OH_Drawing_TypographyStyle* style);
/**
* @brief Sets the maximum number of lines in a text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Return the maximum number of lines in a text.
* @since 12
* @version 1.0
*/
-size_t OH_Drawing_TypographyGetTextMaxLines(OH_Drawing_TypographyStyle*);
+size_t OH_Drawing_TypographyGetTextMaxLines(OH_Drawing_TypographyStyle* style);
/**
* @brief Get the ellipsis of lines in a text.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TypographyStyle Indicates the pointer to a typography style object
+ * @param style Indicates the pointer to a typography style object
* OH_Drawing_TypographyStyle.
* @return Return the ellipsis of lines in a text.
* @since 12
* @version 1.0
*/
-char* OH_Drawing_TypographyGetTextEllipsis(OH_Drawing_TypographyStyle*);
+char* OH_Drawing_TypographyGetTextEllipsis(OH_Drawing_TypographyStyle* style);
/**
* @brief Releases the memory occupied by a list of Ellipsis names.
@@ -2749,19 +2802,19 @@ bool OH_Drawing_TypographyStyleEquals(OH_Drawing_TypographyStyle* from, OH_Drawi
* @brief Releases the memory occupied by text box.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextBox Indicates the pointer to a text box object OH_Drawing_TextBox.
+ * @param textBox Indicates the pointer to a text box object OH_Drawing_TextBox.
* @since 12
* @version 1.0
*/
-void OH_Drawing_TypographyDestroyTextBox(OH_Drawing_TextBox*);
+void OH_Drawing_TypographyDestroyTextBox(OH_Drawing_TextBox* textBox);
/**
* @brief Sets the parameter of text-shadow.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
- * @param OH_Drawing_TextShadow Indicates the pointer to an OH_Drawing_TextShadow object.
+ * @param shadow Indicates the pointer to an OH_Drawing_TextShadow object.
* @param color Indicates the color setting of text-shadow.
- * @param OH_Drawing_Point Indicates the pointer to an OH_Drawing_Point object.
+ * @param offset Indicates the pointer to an OH_Drawing_Point object.
* @param blurRadius Indicates the radius of blur for text-shadow.
* @since 12
* @version 1.0
@@ -2769,6 +2822,67 @@ void OH_Drawing_TypographyDestroyTextBox(OH_Drawing_TextBox*);
void OH_Drawing_SetTextShadow(OH_Drawing_TextShadow* shadow, uint32_t color, OH_Drawing_Point* offset,
double blurRadius);
+/**
+ * @brief Creates an OH_Drawing_TextTab object.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param alignment Indicates enumerates text tab alignment modes. TAB alignment, Support left alignment
+ * right alignment center alignment, other enumeration values are left alignment effect.
+ * @param location Indicates location of text tab.
+ * @return Returns the pointer to the OH_Drawing_TextTab object created. If the object returns NULL,
+ * the creation failed. The possible cause of the failure is that the application address space is used up.
+ * As a result, space cannot be allocated.
+ * @since 14
+ * @version 1.0
+ */
+OH_Drawing_TextTab* OH_Drawing_CreateTextTab(OH_Drawing_TextAlign alignment, float location);
+
+/**
+ * @brief Releases the memory occupied by an OH_Drawing_TextTab object.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param tab Indicates the pointer to an OH_Drawing_TextTab object.
+ * @since 14
+ * @version 1.0
+ */
+void OH_Drawing_DestroyTextTab(OH_Drawing_TextTab* tab);
+
+/**
+ * @brief Get alignment of an OH_Drawing_TextTab object.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param tab Indicates the pointer to an OH_Drawing_TextTab object.
+ * @return Returns align of an OH_Drawing_TextTab object.
+ * @since 14
+ * @version 1.0
+ */
+OH_Drawing_TextAlign OH_Drawing_GetTextTabAlignment(OH_Drawing_TextTab* tab);
+
+/**
+ * @brief Get location of an OH_Drawing_TextTab object.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param tab Indicates the pointer to an OH_Drawing_TextTab object.
+ * @return Returns location of an OH_Drawing_TextTab object.
+ * @since 14
+ * @version 1.0
+ */
+float OH_Drawing_GetTextTabLocation(OH_Drawing_TextTab* tab);
+
+/**
+ * @brief Sets the text tab of OH_Drawing_TypographyStyle object.
+ * Tab alignment does not take effect when text alignment is also set, Or when the ellipsis style is configured.
+ * When the tab is not set or the tab's location property is less than or equal to 0, it is the default space effect.
+ * And all tabs in the paragraph after the setting are aligned according to this tab effect.
+ *
+ * @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
+ * @param style Indicates the pointer to an OH_Drawing_TypographyStyle object.
+ * @param tab Indicates the pointer to an OH_Drawing_TextTab object.
+ * @since 14
+ * @version 1.0
+ */
+void OH_Drawing_SetTypographyTextTab(OH_Drawing_TypographyStyle* style, OH_Drawing_TextTab* tab);
+
/**
* @brief Get DrawingArray size.
*