X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffocus-manager%2Fkeyboard-focus-manager-impl.h;h=298b3a77a65293d0406716def0c609868b5ddccf;hp=fd466783498c0773b44adef57cdc94075abea1b2;hb=297201263692ae5b876a4cd4a872de4adb74073d;hpb=edc5e7ec2426fcf1a21b1e4fb659bce603a28849

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 fd46678..298b3a7 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
@@ -2,7 +2,7 @@
 #define __DALI_TOOLKIT_INTERNAL_KEYBOARD_FOCUS_MANAGER_H__
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,11 @@
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/base-object.h>
+#include <dali/devel-api/object/weak-handle.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
 {
@@ -40,6 +42,8 @@ class KeyboardFocusManager : public Dali::BaseObject
 {
 public:
 
+  typedef Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface CustomAlgorithmInterface;
+
   /**
    * @copydoc Toolkit::KeyboardFocusManager::Get
    */
@@ -110,6 +114,11 @@ public:
    */
   void MoveFocusBackward();
 
+  /**
+   * @copydoc Toolkit::DevelKeyboardFocusManager::SetCustomAlgorithm
+   */
+  void SetCustomAlgorithm(CustomAlgorithmInterface& interface);
+
 public:
 
   /**
@@ -165,10 +174,10 @@ private:
 
   /**
    * Move the focus to the specified actor and send notification for the focus change.
-   * @param actorID The ID of the actor to be queried
+   * @param actor The actor to be queried
    * @return Whether the focus is successful or not
    */
-  bool DoSetCurrentFocusActor(const unsigned int actorID);
+  bool DoSetCurrentFocusActor(Actor actor);
 
   /**
    * Move the focus to the next actor towards the specified direction within the layout control
@@ -240,7 +249,7 @@ private:
   Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType mFocusGroupChangedSignal; ///< The signal to notify the focus group change
   Toolkit::KeyboardFocusManager::FocusedActorEnterKeySignalType mFocusedActorEnterKeySignal; ///< The signal to notify that enter has been pressed on the focused actor
 
-  unsigned int mCurrentFocusActor; ///< The actor ID of current focused actor
+  WeakHandle< Actor > mCurrentFocusActor; ///< A weak handle to the current focused actor
 
   Actor mFocusIndicatorActor; ///< The focus indicator actor shared by all the keyboard focusable actors for highlight
 
@@ -254,6 +263,8 @@ private:
 
   SlotDelegate< KeyboardFocusManager > mSlotDelegate;
 
+  CustomAlgorithmInterface* mCustomAlgorithmInterface; ///< The user's (application / toolkit) implementation of CustomAlgorithmInterface
+
 };
 
 } // namespace Internal