X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Ftext-controls%2Ftext-label.h;h=a85297a1d4ebab0d30e8aa0c5a43d47cfdddb9f2;hb=refs%2Fchanges%2F92%2F197692%2F3;hp=13a9738fe12b37bff85531480c7d99b27506098c;hpb=a0a28eb90260b017d231b0a2ff993825405fd058;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h index 13a9738..a85297a 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-label.h +++ b/dali-toolkit/public-api/controls/text-controls/text-label.h @@ -2,7 +2,7 @@ #define __DALI_TOOLKIT_TEXT_LABEL_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. @@ -63,7 +63,7 @@ class TextLabel; * * @SINCE_1_0.0 */ -class DALI_IMPORT_API TextLabel : public Control +class DALI_TOOLKIT_API TextLabel : public Control { public: @@ -169,39 +169,29 @@ public: UNUSED_PROPERTY_TEXT_COLOR, /** - * @DEPRECATED_1_1.37 Use SHADOW instead - * @brief The drop shadow offset 0 indicates no shadow. - * @details Name "shadowOffset", type Property::VECTOR2. + * @brief This property is removed because it's deprecated. */ - SHADOW_OFFSET, + RESERVED_PROPERTY_01, /** - * @DEPRECATED_1_1.37 Use SHADOW instead - * @brief The color of a drop shadow. - * @details Name "shadowColor", type Property::VECTOR4 + * @brief This property is removed because it's deprecated. */ - SHADOW_COLOR, + RESERVED_PROPERTY_02, /** - * @DEPRECATED_1_1.37 Use UNDERLINE instead - * @brief The underline enabled flag. - * @details Name "underlineEnabled", type Property::BOOLEAN. + * @brief This property is removed because it's deprecated. */ - UNDERLINE_ENABLED, + RESERVED_PROPERTY_03, /** - * @DEPRECATED_1_1.37 Use UNDERLINE instead - * @brief The color of the underline. - * @details Name "underlineColor", type Property::VECTOR4. + * @brief This property is removed because it's deprecated. */ - UNDERLINE_COLOR, + RESERVED_PROPERTY_04, /** - * @DEPRECATED_1_1.37 Use UNDERLINE instead - * @brief Overrides the underline height from font metrics. - * @details Name "underlineHeight", type Property::FLOAT. + * @brief This property is removed because it's deprecated. */ - UNDERLINE_HEIGHT, + RESERVED_PROPERTY_05, /** * @brief Whether the mark-up processing is enabled.