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 "Add ALIASES for new DALi doxygen tagging rule to dali.doxy.in" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
control-impl.h
diff --git
a/dali-toolkit/public-api/controls/control-impl.h
b/dali-toolkit/public-api/controls/control-impl.h
index
ce793f3
..
aa86d6a
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.h
+++ b/
dali-toolkit/public-api/controls/control-impl.h
@@
-35,11
+35,15
@@
namespace Dali
namespace Toolkit
{
namespace Toolkit
{
+/**
+ * @addtogroup dali_toolkit_controls
+ * @{
+ */
+
class StyleManager;
namespace Internal
{
class StyleManager;
namespace Internal
{
-
/**
* @brief This is the internal base class for all controls.
*
/**
* @brief This is the internal base class for all controls.
*
@@
-98,6
+102,13
@@
public:
void SetBackgroundImage( Image image );
/**
void SetBackgroundImage( Image image );
/**
+ * @brief Set the background with a property map.
+ *
+ * @param[in] map The background property map.
+ */
+ void SetBackground(const Property::Map& map);
+
+ /**
* @copydoc Dali::Toolkit::Control::ClearBackground
*/
void ClearBackground();
* @copydoc Dali::Toolkit::Control::ClearBackground
*/
void ClearBackground();
@@
-222,13
+233,16
@@
public:
*/
bool IsKeyboardFocusGroup();
*/
bool IsKeyboardFocusGroup();
- // Called by Focus Manager
-
/**
/**
- * @brief Called by the
accessibility focus manager and keyboard focus manager to activate the Control
+ * @brief Called by the
AccessibilityManager to activate the Control.
*/
DALI_INTERNAL void AccessibilityActivate();
*/
DALI_INTERNAL void AccessibilityActivate();
+ /**
+ * @brief Called by the KeyboardFocusManager.
+ */
+ DALI_INTERNAL void KeyboardEnter();
+
// Signals
/**
// Signals
/**
@@
-270,7
+284,7
@@
protected: // From CustomActorImpl, not to be used by application developers
/**
* @copydoc CustomActorImpl::OnStageConnection()
*/
/**
* @copydoc CustomActorImpl::OnStageConnection()
*/
- virtual void OnStageConnection(
unsigned
int depth );
+ virtual void OnStageConnection( int depth );
/**
* @copydoc CustomActorImpl::OnStageDisconnection()
/**
* @copydoc CustomActorImpl::OnStageDisconnection()
@@
-510,6
+524,14
@@
public: // API for derived classes to override
*/
virtual void OnKeyboardFocusChangeCommitted( Actor commitedFocusableActor );
*/
virtual void OnKeyboardFocusChangeCommitted( Actor commitedFocusableActor );
+ /**
+ * @brief This method is called when the control has enter pressed on it.
+ *
+ * Derived classes should override this to perform custom actions.
+ * @return true if this control supported this action.
+ */
+ virtual bool OnKeyboardEnter();
+
// Gestures
/**
// Gestures
/**
@@
-618,6
+640,9
@@
DALI_IMPORT_API const Internal::Control& GetImplementation( const Dali::Toolkit:
} // namespace Internal
} // namespace Internal
+/**
+ * @}
+ */
} // namespace Toolkit
} // namespace Dali
} // namespace Toolkit
} // namespace Dali