projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Updating programming guide for control property registration" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control.h
diff --git
a/dali-toolkit/public-api/controls/control.h
b/dali-toolkit/public-api/controls/control.h
index
cdeee6b
..
e9200d6
100644
(file)
--- a/
dali-toolkit/public-api/controls/control.h
+++ b/
dali-toolkit/public-api/controls/control.h
@@
-89,6
+89,10
@@
public:
*/
struct Property
{
*/
struct Property
{
+ /**
+ * @brief An enumeration of properties belonging to the Control class.
+ * @SINCE_1_0.0
+ */
enum
{
/**
enum
{
/**
@@
-117,7
+121,7
@@
public:
*/
KEY_INPUT_FOCUS,
/**
*/
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,
* @SINCE_1_1.3
*/
BACKGROUND,
@@
-130,6
+134,10
@@
public:
*/
struct KeyboardFocus
{
*/
struct KeyboardFocus
{
+ /**
+ * @brief Keyboard focus direction
+ * @SINCE_1_0.0
+ */
enum Direction
{
LEFT, ///< Move keyboard focus towards the left 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;
/**
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
* @brief Sets an image as the background of the control.
*
* @SINCE_1_0.0