X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-definitions.h;h=d5ce520468003e9df42c517f403b8fed6cc7f3f5;hp=e98e08e336323c09fb43a7279de3d40c811fc4ed;hb=750fadba87bb959c9af32e89e3f1bc7af6cb6dd2;hpb=f60b3d8e308a5145efe754cbff2a47b4ae278021 diff --git a/dali-toolkit/internal/text/text-definitions.h b/dali-toolkit/internal/text/text-definitions.h old mode 100755 new mode 100644 index e98e08e..d5ce520 --- a/dali-toolkit/internal/text/text-definitions.h +++ b/dali-toolkit/internal/text/text-definitions.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H__ -#define __DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H__ +#ifndef DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H +#define DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,21 +19,18 @@ */ // EXTERNAL INCLUDES -#include #include #include #include #include +#include namespace Dali { - namespace Toolkit { - namespace Text { - typedef TextAbstraction::FontId FontId; ///< The unique identifier for a font face (generated by FontClient). typedef TextAbstraction::FontWidth::Type FontWidth; ///< The font's width. typedef TextAbstraction::FontWeight::Type FontWeight; ///< The font's weight. @@ -54,14 +51,15 @@ typedef TextAbstraction::CharacterDirection CharacterDirection; ///< The charact typedef TextAbstraction::ColorBlendingMode ColorBlendingMode; ///< Defines how a color is blended. typedef TextAbstraction::ColorIndex ColorIndex; ///< An index into an array of colors. -typedef uint32_t GlyphIndex; ///< An index into an array of glyphs. -typedef uint32_t ScriptRunIndex; ///< An index into an array of script runs. -typedef uint32_t FontRunIndex; ///< An index into an array of font runs. -typedef uint32_t UnderlineRunIndex; ///< An index into an array of underline runs. -typedef uint32_t BidirectionalRunIndex; ///< An index into an array of bidirectional info. -typedef uint32_t BidirectionalLineRunIndex; ///< An index into an array of bidirectional line info. -typedef uint32_t LineIndex; ///< An index into an array of lines. -typedef uint32_t ParagraphRunIndex; ///< An index into an array of paragraphs. +typedef uint32_t GlyphIndex; ///< An index into an array of glyphs. +typedef uint32_t ScriptRunIndex; ///< An index into an array of script runs. +typedef uint32_t FontRunIndex; ///< An index into an array of font runs. +typedef uint32_t UnderlineRunIndex; ///< An index into an array of underline runs. +typedef uint32_t StrikethroughRunIndex; ///< An index into an array of underline runs. +typedef uint32_t BidirectionalRunIndex; ///< An index into an array of bidirectional info. +typedef uint32_t BidirectionalLineRunIndex; ///< An index into an array of bidirectional line info. +typedef uint32_t LineIndex; ///< An index into an array of lines. +typedef uint32_t ParagraphRunIndex; ///< An index into an array of paragraphs. } // namespace Text @@ -69,4 +67,4 @@ typedef uint32_t ParagraphRunIndex; ///< An inde } // namespace Dali -#endif // __DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H__ +#endif // DALI_TEXT_ABSTRACTION_TEXT_TYPE_DEFINITIONS_H