X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-devel.h;h=3d340ec01b5ee0e8bac18ecd388298442711ec53;hb=153f1a4fb6d4bae78b3c89fe570e5e662a9a54c1;hp=5753a69f3c7bcc0140f4d646395816bb44576cca;hpb=6c1385cd7a2ba2ffbd628e10576780a1620674b7;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/controls/control-devel.h b/dali-toolkit/devel-api/controls/control-devel.h index 5753a69..3d340ec 100644 --- a/dali-toolkit/devel-api/controls/control-devel.h +++ b/dali-toolkit/devel-api/controls/control-devel.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_CONTROL_DEVEL_H /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -22,6 +22,7 @@ #include // INTERNAL INCLUDES +#include #include #include @@ -39,31 +40,31 @@ class Base; namespace DevelControl { /// @brief AccessibilityActivate signal type. -typedef Signal< void ( ) > AccessibilityActivateSignalType; +typedef Signal AccessibilityActivateSignalType; /// @brief AccessibilityReadingSkipped signal type. -typedef Signal< void ( ) > AccessibilityReadingSkippedSignalType; +typedef Signal AccessibilityReadingSkippedSignalType; /// @brief AccessibilityReadingPaused signal type. -typedef Signal< void ( ) > AccessibilityReadingPausedSignalType; +typedef Signal AccessibilityReadingPausedSignalType; /// @brief AccessibilityReadingResumed signal type. -typedef Signal< void ( ) > AccessibilityReadingResumedSignalType; +typedef Signal AccessibilityReadingResumedSignalType; /// @brief AccessibilityReadingCancelled signal type. -typedef Signal< void ( ) > AccessibilityReadingCancelledSignalType; +typedef Signal AccessibilityReadingCancelledSignalType; /// @brief AccessibilityReadingStopped signal type. -typedef Signal< void ( ) > AccessibilityReadingStoppedSignalType; +typedef Signal AccessibilityReadingStoppedSignalType; /// @brief AccessibilityGetName signal type. -typedef Signal< void ( std::string& ) > AccessibilityGetNameSignalType; +typedef Signal AccessibilityGetNameSignalType; /// @brief AccessibilityGetDescription signal type. -typedef Signal< void ( std::string& ) > AccessibilityGetDescriptionSignalType; +typedef Signal AccessibilityGetDescriptionSignalType; /// @brief AccessibilityDoGesture signal type. -typedef Signal< void ( std::pair& ) > AccessibilityDoGestureSignalType; +typedef Signal&)> AccessibilityDoGestureSignalType; enum State { @@ -358,10 +359,20 @@ using VisualEventSignalType = Signal> GetAccessibilityRelations( Dali::Actor control ); +DALI_TOOLKIT_API std::vector> GetAccessibilityRelations(Dali::Actor control); /** * @brief The method removes all previously appended relations * * @param control object to append attribute to */ -DALI_TOOLKIT_API void ClearAccessibilityRelations( Dali::Actor control ); +DALI_TOOLKIT_API void ClearAccessibilityRelations(Dali::Actor control); /** * @brief The method allows to add or modify value matched with given key. @@ -474,21 +485,21 @@ DALI_TOOLKIT_API void ClearAccessibilityRelations( Dali::Actor control ); * @param key std::string value * @param value std::string value */ -DALI_TOOLKIT_API void AppendAccessibilityAttribute( Dali::Actor control, const std::string& key, const std::string value ); +DALI_TOOLKIT_API void AppendAccessibilityAttribute(Dali::Actor control, const std::string& key, const std::string value); /** * @brief The method erases key with its value from accessibility attributes * @param control object to append attribute to * @param key std::string value */ -DALI_TOOLKIT_API void RemoveAccessibilityAttribute( Dali::Actor control, const std::string& key ); +DALI_TOOLKIT_API void RemoveAccessibilityAttribute(Dali::Actor control, const std::string& key); /** * @brief The method clears accessibility attributes * * @param control object to append attribute to */ -DALI_TOOLKIT_API void ClearAccessibilityAttributes( Dali::Actor control ); +DALI_TOOLKIT_API void ClearAccessibilityAttributes(Dali::Actor control); /** * @brief The method inserts reading information of an accessible object into attributes @@ -496,7 +507,7 @@ DALI_TOOLKIT_API void ClearAccessibilityAttributes( Dali::Actor control ); * @param control object to append attribute to * @param types Reading information types */ -DALI_TOOLKIT_API void SetAccessibilityReadingInfoType( Dali::Actor control, const Dali::Accessibility::ReadingInfoTypes types ); +DALI_TOOLKIT_API void SetAccessibilityReadingInfoType(Dali::Actor control, const Dali::Accessibility::ReadingInfoTypes types); /** * @brief The method returns reading information of an accessible object @@ -504,7 +515,7 @@ DALI_TOOLKIT_API void SetAccessibilityReadingInfoType( Dali::Actor control, cons * @param control object to append attribute to * @return Reading information types */ -DALI_TOOLKIT_API Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType( Dali::Actor control ); +DALI_TOOLKIT_API Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Dali::Actor control); /** * @brief The method erases highlight. @@ -512,7 +523,7 @@ DALI_TOOLKIT_API Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingIn * @param control object to append attribute to * @return bool value, false when it is not possible or something went wrong, at the other way true. */ -DALI_TOOLKIT_API bool ClearAccessibilityHighlight( Dali::Actor control ); +DALI_TOOLKIT_API bool ClearAccessibilityHighlight(Dali::Actor control); /** * @brief The method grabs highlight. @@ -520,7 +531,7 @@ DALI_TOOLKIT_API bool ClearAccessibilityHighlight( Dali::Actor control ); * @param control object to append attribute to * @return bool value, false when it is not possible or something went wrong, at the other way true. */ -DALI_TOOLKIT_API bool GrabAccessibilityHighlight( Dali::Actor control ); +DALI_TOOLKIT_API bool GrabAccessibilityHighlight(Dali::Actor control); /** * @brief The metod presents bitset of control's states. @@ -528,7 +539,7 @@ DALI_TOOLKIT_API bool GrabAccessibilityHighlight( Dali::Actor control ); * @param control object to append attribute to * @return Dali::Accessibility::States is vector of enumerated State. */ -DALI_TOOLKIT_API Dali::Accessibility::States GetAccessibilityStates( Dali::Actor control ); +DALI_TOOLKIT_API Dali::Accessibility::States GetAccessibilityStates(Dali::Actor control); /** * @brief The method force sending notifications about current states to accessibility clients @@ -537,7 +548,7 @@ DALI_TOOLKIT_API Dali::Accessibility::States GetAccessibilityStates( Dali::Actor * @param states mask with states expected to broadcast * @param doRecursive flag pointing if notifications of children's state would be sent */ -DALI_TOOLKIT_API void NotifyAccessibilityStateChange( Dali::Actor control, Dali::Accessibility::States states, bool doRecursive ); +DALI_TOOLKIT_API void NotifyAccessibilityStateChange(Dali::Actor control, Dali::Accessibility::States states, bool doRecursive); /** * The method allows to set specific constructor for creating accessibility structure @@ -556,14 +567,14 @@ DALI_TOOLKIT_API void NotifyAccessibilityStateChange( Dali::Actor control, Dali: * * param constructor callback creating Accessible object */ -DALI_TOOLKIT_API void SetAccessibilityConstructor( Dali::Actor control, std::function(Dali::Actor)> constructor); +DALI_TOOLKIT_API void SetAccessibilityConstructor(Dali::Actor control, std::function(Dali::Actor)> constructor); /** * Returns accessibility object bound to actor, if any * * This method won't bound new accessibility object. Use Dali::Accessibility::Accessible::Get in that case. */ -DALI_TOOLKIT_API Dali::Accessibility::Accessible *GetBoundAccessibilityObject( Dali::Actor control ); +DALI_TOOLKIT_API Dali::Accessibility::Accessible* GetBoundAccessibilityObject(Dali::Actor control); } // namespace DevelControl