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 "DALi Version 1.2.39" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
focus-manager
/
keyboard-focus-manager-impl.h
diff --git
a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
index
468687a
..
6816200
100644
(file)
--- a/
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
+++ b/
dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
@@
-23,6
+23,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
+#include <dali-toolkit/devel-api/focus-manager/keyboard-focus-manager-devel.h>
namespace Dali
{
namespace Dali
{
@@
-40,6
+41,8
@@
class KeyboardFocusManager : public Dali::BaseObject
{
public:
{
public:
+ typedef Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface CustomAlgorithmInterface;
+
/**
* @copydoc Toolkit::KeyboardFocusManager::Get
*/
/**
* @copydoc Toolkit::KeyboardFocusManager::Get
*/
@@
-110,6
+113,11
@@
public:
*/
void MoveFocusBackward();
*/
void MoveFocusBackward();
+ /**
+ * @copydoc Toolkit::DevelKeyboardFocusManager::SetCustomAlgorithm
+ */
+ void SetCustomAlgorithm(CustomAlgorithmInterface& interface);
+
public:
/**
public:
/**
@@
-254,6
+262,8
@@
private:
SlotDelegate< KeyboardFocusManager > mSlotDelegate;
SlotDelegate< KeyboardFocusManager > mSlotDelegate;
+ CustomAlgorithmInterface* mCustomAlgorithmInterface; ///< The user's (application / toolkit) implementation of CustomAlgorithmInterface
+
};
} // namespace Internal
};
} // namespace Internal