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
Fix text and control depth indices to have sane values
[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
e7511a1
..
51f6bd1
100644
(file)
--- a/
dali-toolkit/public-api/controls/control.h
+++ b/
dali-toolkit/public-api/controls/control.h
@@
-40,6
+40,10
@@
namespace Internal
{
class Control;
}
{
class Control;
}
+/**
+ * @addtogroup dali_toolkit_controls
+ * @{
+ */
/**
* @brief Control is the base class for all controls.
/**
* @brief Control is the base class for all controls.
@@
-59,9
+63,9
@@
class Control;
* | long-pressed | @ref GetLongPressGestureDetector().DetectedSignal() |
*
* Actions
* | long-pressed | @ref GetLongPressGestureDetector().DetectedSignal() |
*
* Actions
- * | %Action Name
| %Control method called
|
- * |-------------------
|-
----------------------------------------------------|
- * |
control-activated | %OnActivated()
|
+ * | %Action Name
| %Control method called
|
+ * |-------------------
------|
----------------------------------------------------|
+ * |
accessibility-activated | %OnAccessibilityActivated()
|
*/
class DALI_IMPORT_API Control : public CustomActor
{
*/
class DALI_IMPORT_API Control : public CustomActor
{
@@
-85,8
+89,7
@@
public:
enum
{
STYLE_NAME = PROPERTY_START_INDEX, ///< name "style-name", @see SetStyleName, type std::string
enum
{
STYLE_NAME = PROPERTY_START_INDEX, ///< name "style-name", @see SetStyleName, type std::string
- BACKGROUND_COLOR, ///< name "background-color", @see SetBackgroundColor, type Vector4
- BACKGROUND_IMAGE, ///< name "background-image", @see SetBackgroundImage, type Map
+ BACKGROUND, ///< name "background", @since DALi 1.1.4, type Map
KEY_INPUT_FOCUS, ///< name "key-input-focus", @see SetKeyInputFocus, type bool
};
};
KEY_INPUT_FOCUS, ///< name "key-input-focus", @see SetKeyInputFocus, type bool
};
};
@@
-267,6
+270,8
@@
public:
/**
* @brief Retrieves the background color of the control.
*
/**
* @brief Retrieves the background color of the control.
*
+ * @deprecated DALi 1.1.3 API removed.
+ *
* @return The background color of the control.
*/
Vector4 GetBackgroundColor() const;
* @return The background color of the control.
*/
Vector4 GetBackgroundColor() const;
@@
-274,8
+279,6
@@
public:
/**
* @brief Sets an image as the background of the control.
*
/**
* @brief Sets an image as the background of the control.
*
- * The color of this image is blended with the background color @see SetBackgroundColor
- *
* @param[in] image The image to set as the background.
*/
void SetBackgroundImage( Image image );
* @param[in] image The image to set as the background.
*/
void SetBackgroundImage( Image image );
@@
-403,6
+406,9
@@
public: // Templates for Deriving Classes
};
};
+/**
+ * @}
+ */
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali