X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Ftext-controls%2Ftext-label.h;h=471a619513b98779e64db70a2100fa4a0176eff2;hb=fb87251cfeff34418a36798700b81786e522018a;hp=a85297a1d4ebab0d30e8aa0c5a43d47cfdddb9f2;hpb=6a945b790dae35b878e88f25ca19d69d6e2e6d46;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 a85297a..471a619 100644 --- a/dali-toolkit/public-api/controls/text-controls/text-label.h +++ b/dali-toolkit/public-api/controls/text-controls/text-label.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_TEXT_LABEL_H__ -#define __DALI_TOOLKIT_TEXT_LABEL_H__ +#ifndef DALI_TOOLKIT_TEXT_LABEL_H +#define DALI_TOOLKIT_TEXT_LABEL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -23,10 +23,8 @@ namespace Dali { - namespace Toolkit { - namespace Internal DALI_INTERNAL { class TextLabel; @@ -44,7 +42,6 @@ class TextLabel; * @section TextLabelProperties Properties * |%Property enum |String name |Type |Writable|Animatable| * |----------------------------------|---------------------|----------------|--------|----------| - * | Property::RENDERING_BACKEND | renderingBackend | INTEGER | O | X | * | Property::TEXT | text | STRING | O | X | * | Property::FONT_FAMILY | fontFamily | STRING | O | X | * | Property::FONT_STYLE | fontStyle | STRING or MAP | O | X | @@ -66,7 +63,6 @@ class TextLabel; class DALI_TOOLKIT_API TextLabel : public Control { public: - /** * @brief Enumeration for the start and end property ranges for this control. * @SINCE_1_0.0 @@ -74,10 +70,10 @@ public: enum PropertyRange { PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, ///< @SINCE_1_0.0 - PROPERTY_END_INDEX = PROPERTY_START_INDEX + 1000, ///< Reserve property indices @SINCE_1_0.0 + PROPERTY_END_INDEX = PROPERTY_START_INDEX + 1000, ///< Reserve property indices @SINCE_1_0.0 - ANIMATABLE_PROPERTY_START_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, ///< @SINCE_1_2.60 - ANIMATABLE_PROPERTY_END_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000 ///< Reserve animatable property indices @SINCE_1_2.60 + ANIMATABLE_PROPERTY_START_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, ///< @SINCE_1_2.60 + ANIMATABLE_PROPERTY_END_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000 ///< Reserve animatable property indices @SINCE_1_2.60 }; /** @@ -97,19 +93,11 @@ public: /////////////////////////////////////////////////////////////////////////////// /** - * @DEPRECATED_1_2.53 No longer be supported and will be ignored. - * @brief The type of rendering e.g. bitmap-based. - * @details Name "renderingBackend", type Property::INT. - * @SINCE_1_0.0 - */ - RENDERING_BACKEND = PROPERTY_START_INDEX, - - /** * @brief The text to display in UTF-8 format. * @details Name "text", type Property::STRING. * @SINCE_1_0.0 */ - TEXT, + TEXT = PROPERTY_START_INDEX, /** * @brief The requested font family to use. @@ -161,39 +149,6 @@ public: VERTICAL_ALIGNMENT, /** - * @DEPRECATED_1_2.60 Use the new enum value of TEXT_COLOR instead. - * @brief The color of the text. - * @details Name "unusedPropertyTextColor", type Property::VECTOR4. - * @SINCE_1_0.0 - */ - UNUSED_PROPERTY_TEXT_COLOR, - - /** - * @brief This property is removed because it's deprecated. - */ - RESERVED_PROPERTY_01, - - /** - * @brief This property is removed because it's deprecated. - */ - RESERVED_PROPERTY_02, - - /** - * @brief This property is removed because it's deprecated. - */ - RESERVED_PROPERTY_03, - - /** - * @brief This property is removed because it's deprecated. - */ - RESERVED_PROPERTY_04, - - /** - * @brief This property is removed because it's deprecated. - */ - RESERVED_PROPERTY_05, - - /** * @brief Whether the mark-up processing is enabled. * @details Name "enableMarkup", type Property::BOOLEAN. * @SINCE_1_0.0 @@ -404,8 +359,8 @@ public: */ enum Type { - FINISH_LOOP = 0, ///< Stop animation after current loop finishes. @SINCE_1_2.60 - IMMEDIATE ///< Stop animation immediately and reset position. @SINCE_1_2.60 + FINISH_LOOP = 0, ///< Stop animation after current loop finishes. @SINCE_1_2.60 + IMMEDIATE ///< Stop animation immediately and reset position. @SINCE_1_2.60 }; }; @@ -424,7 +379,7 @@ public: * @param[in] text The text to display * @return A handle to the TextLabel control */ - static TextLabel New( const std::string& text ); + static TextLabel New(const std::string& text); /** * @brief Creates an empty handle. @@ -438,7 +393,15 @@ public: * @SINCE_1_0.0 * @param[in] handle The handle to copy from */ - TextLabel( const TextLabel& handle ); + TextLabel(const TextLabel& handle); + + /** + * @brief Move constructor + * @SINCE_1_9.23 + * + * @param[in] rhs A reference to the moved handle + */ + TextLabel(TextLabel&& rhs); /** * @brief Assignment operator. @@ -447,7 +410,16 @@ public: * @param[in] handle The handle to copy from * @return A reference to this */ - TextLabel& operator=( const TextLabel& handle ); + TextLabel& operator=(const TextLabel& handle); + + /** + * @brief Move assignment + * @SINCE_1_9.23 + * + * @param[in] rhs A reference to the moved handle + * @return A reference to this + */ + TextLabel& operator=(TextLabel&& rhs); /** * @brief Destructor. @@ -467,10 +439,9 @@ public: * @param[in] handle Handle to an object * @return Handle to a TextLabel or an empty handle */ - static TextLabel DownCast( BaseHandle handle ); + static TextLabel DownCast(BaseHandle handle); public: // Not intended for application developers - /// @cond internal /** * @brief Creates a handle using the Toolkit::Internal implementation. @@ -478,7 +449,7 @@ public: // Not intended for application developers * @SINCE_1_0.0 * @param[in] implementation The Control implementation */ - DALI_INTERNAL TextLabel( Internal::TextLabel& implementation ); + DALI_INTERNAL TextLabel(Internal::TextLabel& implementation); /** * @brief Allows the creation of this Control from an Internal::CustomActor pointer. @@ -486,7 +457,7 @@ public: // Not intended for application developers * @SINCE_1_0.0 * @param[in] internal A pointer to the internal CustomActor */ - explicit DALI_INTERNAL TextLabel( Dali::Internal::CustomActor* internal ); + explicit DALI_INTERNAL TextLabel(Dali::Internal::CustomActor* internal); /// @endcond }; @@ -497,4 +468,4 @@ public: // Not intended for application developers } // namespace Dali -#endif // __DALI_TOOLKIT_TEXT_LABEL_H__ +#endif // DALI_TOOLKIT_TEXT_LABEL_H