X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol.h;h=e9200d618781ea720ed396870c35a04c28106c43;hb=02a86c5687ddabb8ff0d5e423f5adf5d53228f73;hp=cdeee6b38cd34c5b7ea8a55d0be6bed89a7313ab;hpb=594b2670227659f2f2905b60c4d3387674a6d846;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h index cdeee6b..e9200d6 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -89,6 +89,10 @@ public: */ struct Property { + /** + * @brief An enumeration of properties belonging to the Control class. + * @SINCE_1_0.0 + */ enum { /** @@ -117,7 +121,7 @@ public: */ KEY_INPUT_FOCUS, /** - * @brief name "background", mutually exclusive with BACKGROUND_COLOR & BACKGROUND_IMAGE, type Map + * @brief name "background", mutually exclusive with BACKGROUND_COLOR & BACKGROUND_IMAGE, type Map or std::string for URL * @SINCE_1_1.3 */ BACKGROUND, @@ -130,6 +134,10 @@ public: */ struct KeyboardFocus { + /** + * @brief Keyboard focus direction + * @SINCE_1_0.0 + */ enum Direction { LEFT, ///< Move keyboard focus towards the left direction @SINCE_1_0.0 @@ -325,6 +333,8 @@ public: Vector4 GetBackgroundColor() const; /** + * @DEPRECATED_1_2_8, use Property::BACKGROUND instead + * * @brief Sets an image as the background of the control. * * @SINCE_1_0.0