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 "Move tts-player.h from devel-api to public-api" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
focus-manager
/
keyboard-focus-manager.h
diff --git
a/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
b/dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
index
68638a3
..
6afcd6b
100644
(file)
--- a/
dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
+++ b/
dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h
@@
-55,7
+55,7
@@
class DALI_IMPORT_API KeyboardFocusManager : public BaseHandle
public:
/// @brief Pre focus change signal
public:
/// @brief Pre focus change signal
- typedef Signal< Actor ( Actor, Actor, Control::KeyboardFocus
Navigation
Direction ) > PreFocusChangeSignalType;
+ typedef Signal< Actor ( Actor, Actor, Control::KeyboardFocus
::
Direction ) > PreFocusChangeSignalType;
/// @brief Focus changed signal
typedef Signal< void ( Actor, Actor ) > FocusChangedSignalType;
/// @brief Focus changed signal
typedef Signal< void ( Actor, Actor ) > FocusChangedSignalType;
@@
-117,7
+117,7
@@
public:
* @param direction The direction of focus movement
* @return true if the movement was successful
*/
* @param direction The direction of focus movement
* @return true if the movement was successful
*/
- bool MoveFocus(Control::KeyboardFocus
Navigation
Direction direction);
+ bool MoveFocus(Control::KeyboardFocus
::
Direction direction);
/**
* @brief Clear the focus from the current focused actor if any, so
/**
* @brief Clear the focus from the current focused actor if any, so
@@
-214,7
+214,7
@@
public: // Signals
*
* A callback of the following type may be connected:
* @code
*
* A callback of the following type may be connected:
* @code
- * Actor YourCallbackName(Actor currentFocusedActor, Actor proposedActorToFocus, Control::KeyboardFocus
Navigation
Direction direction);
+ * Actor YourCallbackName(Actor currentFocusedActor, Actor proposedActorToFocus, Control::KeyboardFocus
::
Direction direction);
* @endcode
* @pre The Object has been initialized.
* @return The signal to connect to.
* @endcode
* @pre The Object has been initialized.
* @return The signal to connect to.