X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Ftext%2Ftext-enumerations.h;h=e5b7fbe2526edeeedcdffc5e3322bb0f554ff814;hp=d9f23be4108e6b11ad60899d153d428c28c0d9e2;hb=3a6adcbec75784b051cb9ebaf204d72b553ea355;hpb=410125f32fcd135226a2a0a668b2855ea9e17a69 diff --git a/dali-toolkit/public-api/text/text-enumerations.h b/dali-toolkit/public-api/text/text-enumerations.h index d9f23be..e5b7fbe 100644 --- a/dali-toolkit/public-api/text/text-enumerations.h +++ b/dali-toolkit/public-api/text/text-enumerations.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_TEXT_ENUMERATIONS_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -20,18 +20,15 @@ namespace Dali { - namespace Toolkit { - /** - * @addtogroup dali_toolkit_controls + * @addtogroup dali_toolkit_controls_text_controls * @{ */ namespace Text { - /** * @brief The available Horizontal alignments for text. * @@ -39,7 +36,6 @@ namespace Text */ namespace HorizontalAlignment { - /** * @brief Enumerations for Horizontal alignment. * @@ -47,9 +43,9 @@ namespace HorizontalAlignment */ enum Type { - BEGIN, ///< @SINCE_1_2.60 - CENTER, ///< @SINCE_1_2.60 - END ///< @SINCE_1_2.60 + BEGIN, ///< @SINCE_1_2.60 + CENTER, ///< @SINCE_1_2.60 + END ///< @SINCE_1_2.60 }; } // namespace HorizontalAlignment @@ -61,7 +57,6 @@ enum Type */ namespace VerticalAlignment { - /** * @brief Enumerations for Vertical alignment. * @@ -69,9 +64,9 @@ namespace VerticalAlignment */ enum Type { - TOP, ///< @SINCE_1_2.60 - CENTER, ///< @SINCE_1_2.60 - BOTTOM ///< @SINCE_1_2.60 + TOP, ///< @SINCE_1_2.60 + CENTER, ///< @SINCE_1_2.60 + BOTTOM ///< @SINCE_1_2.60 }; } // namespace VerticalAlignment @@ -101,7 +96,6 @@ enum Type */ namespace LineWrap { - /** * @brief Enumerations specifying how a line is wrapped. * @SINCE_1_2.60 @@ -109,12 +103,30 @@ namespace LineWrap */ enum Mode { - WORD, ///< @SINCE_1_2.60 - CHARACTER ///< @SINCE_1_2.60 + WORD, ///< @SINCE_1_2.60 + CHARACTER ///< @SINCE_1_2.60 }; } // namespace LineWrap +/** + * @brief The available underline types for text. + * @SINCE_1_2.60 + */ +namespace Underline +{ +/** + * @brief Enumerations specifying the underline type. + */ +enum Type +{ + SOLID, + DASHED, + DOUBLE +}; + +} // namespace UnderlineType + } // namespace Text /**