X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ffocus-manager%2Fkeyboard-focus-manager-impl.h;h=87e73f8abed722bfa40b497e00d8309645b1d539;hb=HEAD;hp=783e3f56c539d3db5c8dc6b11ca9d8fbd1d98372;hpb=0e6913888355655cab0dabc0e9cb1666c61dc378;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 783e3f5..87e73f8 100644
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h
@@ -90,7 +90,7 @@ public:
   /**
    * @copydoc Toolkit::KeyboardFocusManager::MoveFocus
    */
-  bool MoveFocus(Toolkit::Control::KeyboardFocus::Direction direction);
+  bool MoveFocus(Toolkit::Control::KeyboardFocus::Direction direction, const std::string& deviceName = "");
 
   /**
    * @copydoc Toolkit::KeyboardFocusManager::ClearFocus
@@ -162,6 +162,16 @@ public:
    */
   bool IsDefaultAlgorithmEnabled() const;
 
+  /**
+   * @copydoc Toolkit::DevelKeyboardFocusManager::SetFocusFinderRootActor
+   */
+  void SetFocusFinderRootActor(Actor actor);
+
+  /**
+   * @copydoc Toolkit::DevelKeyboardFocusManager::ResetFocusFinderRootActor
+   */
+  void ResetFocusFinderRootActor();
+
 public:
   /**
    * @copydoc Toolkit::KeyboardFocusManager::PreFocusChangeSignal()
@@ -295,7 +305,13 @@ private:
    * Callback for the wheel event when the custom wheel event occurs.
    * @param[in] wheel The WheelEvent information
    */
-  bool OnWheelEvent(const WheelEvent& wheel);
+  bool OnCustomWheelEvent(const WheelEvent& wheel);
+
+  /**
+   * Callback for the wheel event when the wheel event occurs.
+   * @param[in] wheel The WheelEvent information
+   */
+  void OnWheelEvent(const WheelEvent& wheel);
 
   /**
    * Called when the window focus is changed.
@@ -315,7 +331,17 @@ private:
    * @param[in]  event  The WheelEvent.
    * @return True if WheelEvent is consumed.
    */
-  bool EmitWheelSignals(Actor actor, const WheelEvent& event);
+  bool EmitCustomWheelSignals(Actor actor, const WheelEvent& event);
+
+  /**
+   * Clear the focus indicator actor.
+   */
+  void ClearFocusIndicator();
+
+  /**
+   * Gets the current native window id
+   */
+  uint32_t GetCurrentWindowId() const;
 
 private:
   // Undefined
@@ -333,6 +359,8 @@ private:
 
   Actor mFocusIndicatorActor; ///< The focus indicator actor shared by all the keyboard focusable actors for highlight
 
+  WeakHandle<Actor> mFocusFinderRootActor; ///<The root actor from which the focus finder is started.
+
   FocusStack mFocusHistory; ///< Stack to contain pre-focused actor's BaseObject*
 
   SlotDelegate<KeyboardFocusManager> mSlotDelegate;
@@ -358,6 +386,9 @@ private:
   bool mClearFocusOnTouch : 1; ///< Whether clear focus on touch.
 
   bool mEnableDefaultAlgorithm : 1; ///< Whether use default algorithm focus
+
+  uint32_t mCurrentWindowId; ///< The current native window id
+
 };
 
 } // namespace Internal