X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Ftext-controls%2Ftext-label-devel.h;h=72ad6f8909aeef222d3ffeb4d1a3bda0e36fcc51;hp=2838a001616d52a67f811252ceba34bf49856a1b;hb=a267f3da043b1b792ffc64d1848542aa761e44c0;hpb=6f2c97cdf289951bf0182f99c9d528d3ff2d78e7 diff --git a/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h b/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h old mode 100644 new mode 100755 index 2838a00..72ad6f8 --- a/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h +++ b/dali-toolkit/devel-api/controls/text-controls/text-label-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_TEXT_LABEL_DEVEL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -43,11 +43,11 @@ namespace Property HORIZONTAL_ALIGNMENT = Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, VERTICAL_ALIGNMENT = Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, UNUSED_PROPERTY_TEXT_COLOR = Dali::Toolkit::TextLabel::Property::UNUSED_PROPERTY_TEXT_COLOR, - SHADOW_OFFSET = Dali::Toolkit::TextLabel::Property::SHADOW_OFFSET, - SHADOW_COLOR = Dali::Toolkit::TextLabel::Property::SHADOW_COLOR, - UNDERLINE_ENABLED = Dali::Toolkit::TextLabel::Property::UNDERLINE_ENABLED, - UNDERLINE_COLOR = Dali::Toolkit::TextLabel::Property::UNDERLINE_COLOR, - UNDERLINE_HEIGHT = Dali::Toolkit::TextLabel::Property::UNDERLINE_HEIGHT, + RESERVED_PROPERTY_01 = Dali::Toolkit::TextLabel::Property::RESERVED_PROPERTY_01, + RESERVED_PROPERTY_02 = Dali::Toolkit::TextLabel::Property::RESERVED_PROPERTY_02, + RESERVED_PROPERTY_03 = Dali::Toolkit::TextLabel::Property::RESERVED_PROPERTY_03, + RESERVED_PROPERTY_04 = Dali::Toolkit::TextLabel::Property::RESERVED_PROPERTY_04, + RESERVED_PROPERTY_05 = Dali::Toolkit::TextLabel::Property::RESERVED_PROPERTY_05, ENABLE_MARKUP = Dali::Toolkit::TextLabel::Property::ENABLE_MARKUP, ENABLE_AUTO_SCROLL = Dali::Toolkit::TextLabel::Property::ENABLE_AUTO_SCROLL, AUTO_SCROLL_SPEED = Dali::Toolkit::TextLabel::Property::AUTO_SCROLL_SPEED, @@ -67,10 +67,79 @@ namespace Property /** * @brief The direction of the layout. - * @details Name "textDirection", type Property::Integer, Read-Only. + * @details Name "textDirection", type [Type](@ref Dali::Toolkit::DevelText::TextDirection::Type) (Property::INTEGER), Read/Write + * @note The text direction can be changed only by replacing the text itself. * @see TextDirection::Type for supported values. */ TEXT_DIRECTION, + + /** + * @brief Alignment of text within area of single line + * @details Name "verticalLineAlignment", type [Type](@ref Dali::Toolkit::DevelText::VerticalLineAlignment::Type) (Property::INTEGER), Read/Write + * @note The default value is TOP + * @see VerticalLineAlignment::Type for supported values + */ + VERTICAL_LINE_ALIGNMENT, + + /** + * @brief The default text background parameters. + * @details Name "textBackground", type Property::MAP. + * @note Use "textBackground" as property name to avoid conflict with Control's "background" property + * + * The background map contains the following keys: + * + * | %Property Name | Type | Required | Description | + * |----------------------|----------|----------|--------------------------------------------------------------------------------------------------------------------| + * | enable | BOOLEAN | No | True to enable the background or false to disable (the default value is false) | + * | color | VECTOR4 | No | The color of the background (the default value is Color::CYAN) | + */ + BACKGROUND, + + /** + * @brief Ignore spaces after text. + * @details Name "ignoreSpacesAfterText", type (Property::BOLEAN), Read/Write + * @note The default value is true + */ + IGNORE_SPACES_AFTER_TEXT, + + /** + * @brief Modifies the default text alignment to match the direction of the system language. + * @details Name "matchSystemLanguageDirection", type (Property::BOLEAN), Read/Write + * @note The default value is false + * + * If MATCH_SYSTEM_LANGUAGE_DIRECTION property set true, the default text alignment to match the direction of the system language. + * + * ex) Current system language direction LTR. + * TextLabel::New("Hello world \n ﻡﺮﺤﺑﺍ. "); + * TextLabel::Property::HORIZONTAL_ALIGNMENT, "END" + * + * | TextLabel::Property::MATCH_SYSTEM_LANGUAGE_DIRECTION | + * |----------------------------------------------------------------------- + * | false (default) | true | + * |-----------------------------------|----------------------------------| + * | Hello world | Hello world | + * | ﻡﺮﺤﺑﺍ. | ﻡﺮﺤﺑﺍ. | + * + */ + MATCH_SYSTEM_LANGUAGE_DIRECTION, + + /** + * @brief The text fit parameters. + * @details Name "textFit", type Property::MAP. + * @note The default value is false + * + * The textFit map contains the following keys: + * + * | %Property Name | Type | Required | Description | + * |----------------------|----------|----------|--------------------------------------------------------------------------------------------------------------------| + * | enable | BOOLEAN | No | True to enable the text fit or false to disable (the default value is false) | + * | minSize | FLOAT | No | Minimum Size for text fit (the default value is 10.f) | + * | maxSize | FLOAT | No | Maximum Size for text fit (the default value is 100.f) | + * | stepSize | FLOAT | No | Step Size for font increase (the default value is 1.f) | + * | fontSizeType | STRING | No | The size type of font, You can choose between "pointSize" or "pixelSize". (the default value is "pointSize") | + */ + TEXT_FIT, + }; } // namespace Property