X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol.h;h=af840cd7ddbf6830fc3532a0d302ebd6c1fb1e13;hb=c350c8cf7b59f38ab4cf1e10d27933d98a208d28;hp=4ff673e73de08a55614e6ebc188bbe11566d9324;hpb=b458e407eba11c73f38da68bce8e967a30ea03e2;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 4ff673e..af840cd 100644 --- a/dali-toolkit/public-api/controls/control.h +++ b/dali-toolkit/public-api/controls/control.h @@ -82,13 +82,13 @@ public: { enum { - BACKGROUND_COLOR = PROPERTY_START_INDEX, ///< name "background-color", @see SetBackgroundColor, type VECTOR4 - BACKGROUND, ///< name "background", @see SetBackground, type MAP - WIDTH_POLICY, ///< name "width-policy", @see SetSizePolicy, type STRING - HEIGHT_POLICY, ///< name "height-policy", @see SetSizePolicy, type STRING - MINIMUM_SIZE, ///< name "minimum-size", @see SetMinimumSize, type VECTOR3 - MAXIMUM_SIZE, ///< name "maximum-size", @see SetMaximumSize, type VECTOR3 - KEY_INPUT_FOCUS, ///< name "key-input-focus", @see SetKeyInputFocus, type BOOLEAN + BACKGROUND_COLOR = PROPERTY_START_INDEX, ///< name "background-color", @see SetBackgroundColor, type Vector4 + BACKGROUND, ///< name "background", @see SetBackground, type Map + WIDTH_POLICY, ///< name "width-policy", @see SetSizePolicy, type std::string + HEIGHT_POLICY, ///< name "height-policy", @see SetSizePolicy, type std::string + MINIMUM_SIZE, ///< name "minimum-size", @see SetMinimumSize, type Vector3 + MAXIMUM_SIZE, ///< name "maximum-size", @see SetMaximumSize, type Vector3 + KEY_INPUT_FOCUS, ///< name "key-input-focus", @see SetKeyInputFocus, type bool }; };