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=7283b1ef0b76f2d19c13a02f0227c80b66cf8221;hp=42adfc325c3d85af8ad4ed7586eba8c285afa3a5;hb=e92dc54dd0580f27586bcaf04bf9fa2a6ae798dc;hpb=57869973578f6a0b0f836d396c7232ddb8302c6b 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 42adfc3..7283b1e 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) 2014 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. @@ -19,12 +19,12 @@ */ // EXTERNAL INCLUDES -#include -#include #include +#include // INTERNAL INCLUDES #include +#include namespace Dali { @@ -42,6 +42,8 @@ class KeyboardFocusManager : public Dali::BaseObject { public: + typedef Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface CustomAlgorithmInterface; + /** * @copydoc Toolkit::KeyboardFocusManager::Get */ @@ -65,7 +67,7 @@ public: /** * @copydoc Toolkit::KeyboardFocusManager::MoveFocus */ - bool MoveFocus(Toolkit::Control::KeyboardFocusNavigationDirection direction); + bool MoveFocus(Toolkit::Control::KeyboardFocus::Direction direction); /** * @copydoc Toolkit::KeyboardFocusManager::ClearFocus @@ -107,6 +109,16 @@ public: */ Actor GetFocusIndicatorActor(); + /** + * Move current focus to backward + */ + void MoveFocusBackward(); + + /** + * @copydoc Toolkit::DevelKeyboardFocusManager::SetCustomAlgorithm + */ + void SetCustomAlgorithm(CustomAlgorithmInterface& interface); + public: /** @@ -125,9 +137,9 @@ public: Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType& FocusGroupChangedSignal(); /** - * @copydoc Toolkit::KeyboardFocusManager::FocusedActorActivatedSignal() + * @copydoc Toolkit::KeyboardFocusManager::FocusedActorEnterKeySignal() */ - Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalType& FocusedActorActivatedSignal(); + Toolkit::KeyboardFocusManager::FocusedActorEnterKeySignalType& FocusedActorEnterKeySignal(); /** * Connects a callback function with the object's signals. @@ -149,6 +161,14 @@ protected: private: + typedef Dali::Vector< Dali::BaseObject* > FocusStack; ///< Define Dali::Vector< Dali::BaseObject* > as FocusStack to contain focus history + typedef FocusStack::Iterator FocusStackIterator; ///< Define FocusStack::Iterator as FocusStackIterator to navigate FocusStack + + /** + * Get configuration from StyleManager. + */ + void GetConfigurationFromStyleManger(); + /** * Get the focus group of current focused actor. * @pre The FocusManager has been initialized. @@ -159,10 +179,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 @@ -171,7 +191,7 @@ private: * @param direction The direction of focus movement * @return Whether the focus is successful or not */ - bool DoMoveFocusWithinLayoutControl(Toolkit::Control control, Actor actor, Toolkit::Control::KeyboardFocusNavigationDirection direction); + bool DoMoveFocusWithinLayoutControl(Toolkit::Control control, Actor actor, Toolkit::Control::KeyboardFocus::Direction direction); /** * Move the focus to the first focusable actor in the next focus group in the forward @@ -183,16 +203,11 @@ private: bool DoMoveFocusToNextFocusGroup(bool forward); /** - * Activate the actor. If the actor is control, call OnActivated virtual function. - * This function will emit FocusedActorActivatedSignal. - * @param actor The actor to activate + * Enter has been pressed on the actor. If the actor is control, call the OnKeybaordEnter virtual function. + * This function will emit FocusedActorEnterKeySignal. + * @param actor The actor to notify */ - void DoActivate(Actor actor); - - /** - * Create the default indicator actor to highlight the focused actor. - */ - void CreateDefaultFocusIndicatorActor(); + void DoKeyboardEnter( Actor actor ); /** * Check whether the actor is a layout control that supports two dimensional keyboard navigation. @@ -221,15 +236,9 @@ private: /** * Callback for the touch event when the screen is touched and when the touch ends * (i.e. the down & up touch events only). - * @param[in] touchEvent The touch event - */ - void OnTouched(const TouchEvent& touchEvent); - - /** - * Change the keyboard focus status when keyboard focus feature turned on or off. - * @return Whether the status is changed or not. + * @param[in] touch The touch information */ - void OnPhysicalKeyboardStatusChanged(PhysicalKeyboard keyboard); + void OnTouch( const TouchData& touch ); private: @@ -243,21 +252,24 @@ private: Toolkit::KeyboardFocusManager::PreFocusChangeSignalType mPreFocusChangeSignal; ///< The signal to notify the focus will be changed Toolkit::KeyboardFocusManager::FocusChangedSignalType mFocusChangedSignal; ///< The signal to notify the focus change Toolkit::KeyboardFocusManager::FocusGroupChangedSignalType mFocusGroupChangedSignal; ///< The signal to notify the focus group change - Toolkit::KeyboardFocusManager::FocusedActorActivatedSignalType mFocusedActorActivatedSignal; ///< The signal to notify the activation of focused actor + 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 - bool mFocusGroupLoopEnabled:1; ///< Whether the focus movement is looped within the same focus group + int mIsFocusIndicatorEnabled; ///< Whether indicator should be shown / hidden when getting focus. It could be enabled when keyboard focus feature is enabled and navigation keys or 'Tab' key are pressed. - bool mIsKeyboardFocusEnabled:1; ///< Whether keyboard focus feature turned on/off - - bool mIsFocusIndicatorEnabled:1; ///< Whether indicator should be shown / hidden. It could be enabled when keyboard focus feature enabled and navigation keys or 'Tab' key pressed. + bool mFocusGroupLoopEnabled:1; ///< Whether the focus movement is looped within the same focus group bool mIsWaitingKeyboardFocusChangeCommit:1; /// A flag to indicate PreFocusChangeSignal emitted but the proposed focus actor is not commited by the application yet. + FocusStack mFocusHistory; ///< Stack to contain pre-focused actor's BaseObject* + SlotDelegate< KeyboardFocusManager > mSlotDelegate; + + CustomAlgorithmInterface* mCustomAlgorithmInterface; ///< The user's (application / toolkit) implementation of CustomAlgorithmInterface + }; } // namespace Internal