X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Faccessibility-manager%2Faccessibility-manager-impl.h;h=3d02c5f34e555080b458545cafd883f496a8247f;hb=refs%2Fchanges%2F30%2F241130%2F3;hp=b2428d96f80ae31765cd2801a190be7ba36b2375;hpb=94517504b052e71c97105d13625d7f2ce5933889;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h index b2428d9..3d02c5f 100644 --- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h +++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H__ -#define __DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H__ +#ifndef DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H +#define DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -23,11 +23,11 @@ #include #include #include +#include #include -#include // INTERNAL INCLUDES -#include +#include #include namespace Dali @@ -198,6 +198,11 @@ public: */ Actor GetFocusGroup(Actor actor); + /** + * @copydoc Toolkit::AccessibilityManager::GetReadPosition + */ + Vector2 GetReadPosition() const; + public: /** @@ -215,17 +220,6 @@ public: */ Toolkit::AccessibilityManager::FocusedActorActivatedSignalType& FocusedActorActivatedSignal(); - /** - * Connects a callback function with the object's signals. - * @param[in] object The object providing the signal. - * @param[in] tracker Used to disconnect the signal. - * @param[in] signalName The signal to connect to. - * @param[in] functor A newly allocated FunctorDelegate. - * @return True if the signal was connected. - * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor. - */ - static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ); - public: // Signals /** @@ -413,14 +407,6 @@ public: // Signals } /** - * @copydoc Dali::Toolkit::AccessibilityManager::ActionReadIndicatorInformationSignal - */ - AccessibilityActionSignalType& ActionReadIndicatorInformationSignal() - { - return mActionReadIndicatorInformationSignal; - } - - /** * @copydoc Dali::Toolkit::AccessibilityManager::ActionReadPauseResumeSignal */ AccessibilityActionSignalType& ActionReadPauseResumeSignal() @@ -485,18 +471,13 @@ private: bool DoMoveFocus(FocusIDIter focusIDIter, bool forward, bool wrapped); /** - * Activate the actor. If the actor is control, call OnActivated virtual function. + * Activate the actor. If the actor is control, call OnAccessibilityActivated virtual function. * This function will emit FocusedActorActivatedSignal. * @param actor The actor to activate */ void DoActivate(Actor actor); /** - * Create the default indicator actor to highlight the focused actor. - */ - void CreateDefaultFocusIndicatorActor(); - - /** * Set whether the actor is focusable or not. A focusable property will be registered for * the actor if not yet. * @param actor The actor to be focused @@ -509,7 +490,7 @@ private: * @param[in] panEvent The pan event to be handled. * @return whether the gesture is handled successfully or not. */ - virtual bool HandlePanGesture(const Integration::PanGestureEvent& panEvent); + virtual bool HandlePanGesture(const AccessibilityGestureEvent& panEvent); /** * Change the accessibility status when Accessibility feature(screen-reader) turned on or off. @@ -525,10 +506,10 @@ private: /** * Perform the accessibility action associated with a scroll event. - * @param touchEvent The touch point (and time) of the event. + * @param touch The touch point (and time) of the event. * @return whether the focus is cleared or not. */ - virtual bool AccessibilityActionScroll( Dali::TouchEvent& touchEvent ); + virtual bool AccessibilityActionScroll( Dali::TouchEvent& touch ); /** * Perform the accessibility action to move focus to the previous focusable actor (by one finger flick up). @@ -646,14 +627,14 @@ private: /** * Perform the accessibility action to move the focus to the first item on the top - * and read from the top item continously (by three fingers single tap). + * and read from the top item continuously (by three fingers single tap). * @return whether the accessibility action is performed or not. */ virtual bool AccessibilityActionReadFromTop(); /** * Perform the accessibility action to move the focus to and read from the next item - * continously (by three fingers double tap). + * continuously (by three fingers double tap). * @return whether the accessibility action is performed or not. */ virtual bool AccessibilityActionReadFromNext(); @@ -665,12 +646,6 @@ private: virtual bool AccessibilityActionZoom(); /** - * Perform the accessibility action to read the information in the indicator (by two fingers triple tap). - * @return whether the accessibility action is performed or not. - */ - virtual bool AccessibilityActionReadIndicatorInformation(); - - /** * Perform the accessibility action to pause/resume the current read out (by two fingers single tap). * @return whether the accessibility action is performed or not. */ @@ -683,13 +658,6 @@ private: virtual bool AccessibilityActionStartStop(); /** - * Perform the accessibility action to mouse move (by one finger tap & hold and move). - * @param touchEvent touch event structure - * @return whether the accessibility action is performed or not. - */ - virtual bool AccessibilityActionTouch(const TouchEvent& touchEvent); - - /** * This function is connected to the TtsPlayer StateChangeSignal. * It is called when the TTS players state changes. * @param previousState The previous state of the TTS player (for comparison) @@ -734,7 +702,6 @@ private: AccessibilityActionSignalType mActionReadFromTopSignal; AccessibilityActionSignalType mActionReadFromNextSignal; AccessibilityActionSignalType mActionZoomSignal; - AccessibilityActionSignalType mActionReadIndicatorInformationSignal; AccessibilityActionSignalType mActionReadPauseResumeSignal; AccessibilityActionSignalType mActionStartStopSignal; AccessibilityActionScrollSignalType mActionScrollSignal; @@ -746,6 +713,8 @@ private: Actor mFocusIndicatorActor; ///< The focus indicator actor shared by all the focusable actors for highlight Vector2 mPreviousPosition; ///< The previous pan position; useful for calculating velocity for Gesture::Finished events unsigned int mRecursiveFocusMoveCounter; ///< The counter to count the number of recursive focus movement attempted before the focus movement is successful. + std::string mFocusSoundFilePath; ///< The path of the focus sound file + std::string mFocusChainEndSoundFilePath; ///< The path of the focus chain end sound file bool mIsWrapped:1; ///< Whether the focus movement is wrapped around or not bool mIsFocusWithinGroup:1; ///< Whether the focus movement is limited to the current focus group or not @@ -755,6 +724,8 @@ private: bool mTtsCreated:1; ///< Whether the TTS Player has been accessed bool mIsFocusIndicatorEnabled:1; ///< Whether indicator should be shown / hidden. It could be enabled when TTS enabled or 'Tab' key operated. bool mContinuousPlayMode:1; ///< Keeps track of whether or not we are in continuous play mode + bool mIsFocusSoundFilePathSet:1; ///< Whether the path of the focus sound file has been set + bool mIsFocusChainEndSoundFilePathSet:1; ///< Whether the path of the focus chain end sound file has been set }; @@ -782,4 +753,4 @@ inline const Internal::AccessibilityManager& GetImpl(const Dali::Toolkit::Access } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H__ +#endif // DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H