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 "OnActivated() change for Accessibility and KeyboardFocus" into devel/master
[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
63ea4e9
..
1c3c35d
100644
(file)
--- a/
dali-toolkit/public-api/controls/control-impl.h
+++ b/
dali-toolkit/public-api/controls/control-impl.h
@@
-222,13
+222,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
+273,7
@@
protected: // From CustomActorImpl, not to be used by application developers
/**
* @copydoc CustomActorImpl::OnStageConnection()
*/
/**
* @copydoc CustomActorImpl::OnStageConnection()
*/
- virtual void OnStageConnection();
+ virtual void OnStageConnection(
unsigned int depth
);
/**
* @copydoc CustomActorImpl::OnStageDisconnection()
/**
* @copydoc CustomActorImpl::OnStageDisconnection()
@@
-465,6
+468,14
@@
public: // API for derived classes to override
*/
virtual bool OnAccessibilityValueChange( bool isIncrease );
*/
virtual bool OnAccessibilityValueChange( bool isIncrease );
+ /**
+ * @brief This method should be overridden by deriving classes when they wish to respond
+ * the accessibility zoom action
+ *
+ * @return true if the zoom action has been consumed by this control
+ */
+ virtual bool OnAccessibilityZoom();
+
// Keyboard focus
/**
// Keyboard focus
/**
@@
-502,6
+513,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
/**