X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-devel.h;h=66df21c1fb08f8f3b8939b33a07077541f421e34;hb=refs%2Fchanges%2F17%2F272317%2F3;hp=36b83f9b7a22825d82df5c148fb2656fd7e615d5;hpb=d905c34da8009d5da7772461ce3c73cf49d043a5;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 36b83f9..66df21c 100644 --- a/dali-toolkit/devel-api/controls/control-devel.h +++ b/dali-toolkit/devel-api/controls/control-devel.h @@ -18,13 +18,13 @@ * */ // EXTERNAL INCLUDES -#include +#include #include #include #include // INTERNAL INCLUDES -#include +#include #include #include @@ -175,11 +175,13 @@ enum * @see Dali::Accessibility::Role */ ACCESSIBILITY_ROLE, + /** * @brief Mark of able to highlight object. * @details Name "accessibilityHighlightable", type Property::BOOLEAN. */ ACCESSIBILITY_HIGHLIGHTABLE, + /** * @brief Set of accessibility attributes describing object in accessibility hierarchy * @details Name "accessibilityAttributes", type Property::MAP @@ -192,6 +194,13 @@ enum * @note If a control's dispatchKeyEvents is set to false, then it's children will not emit a key event signal either. */ DISPATCH_KEY_EVENTS, + + /** + * @brief Marks the object as invisible to AT-SPI clients. + * @details Name "accessibilityHidden", type Property::BOOLEAN. + * @note The representative Accessible object will not appear in the AT-SPI tree. + */ + ACCESSIBILITY_HIDDEN, }; } // namespace Property @@ -371,20 +380,6 @@ DALI_TOOLKIT_API VisualEventSignalType& VisualEventSignal(Control control); DALI_TOOLKIT_API Dali::Property GetVisualProperty(Control control, Dali::Property::Index index, Dali::Property::Key visualPropertyKey); /** - * @brief Retrieve visual/renderer property animation between this Control and source control. - * Input animation must be created before this method called. - * And the animations between this method created are added the input animation. - * This method generates visual/renderer property animation but not creates Actor property animation. - * - * @param[in] control The control - * @param[in] animation generated animation - * @param[in] source source control of the animation. - * @param[in] alphaFunction AlphaFunction of the animation - * @param[in] timePeriod TimePeriod of the animation - */ -DALI_TOOLKIT_API void CreateTransitions(Control control, Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod timePeriod); - -/** * @brief The signal is emmited as a succession of "activate" signal send by accessibility client. * @return The signal to connect to */ @@ -467,7 +462,7 @@ DALI_TOOLKIT_API AccessibilityDoGestureSignalType& AccessibilityDoGestureSignal( * @param destination Actor object * @param relation enumerated value describing relation */ -DALI_TOOLKIT_API void AppendAccessibilityRelation(Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation); +DALI_TOOLKIT_API void AppendAccessibilityRelation(Toolkit::Control control, Dali::Actor destination, Dali::Accessibility::RelationType relation); /** * @brief The method allows removing relation @@ -476,7 +471,7 @@ DALI_TOOLKIT_API void AppendAccessibilityRelation(Dali::Actor control, Actor des * @param destination Actor object * @param relation enumerated value describing relation */ -DALI_TOOLKIT_API void RemoveAccessibilityRelation(Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation); +DALI_TOOLKIT_API void RemoveAccessibilityRelation(Toolkit::Control control, Dali::Actor destination, Dali::Accessibility::RelationType relation); /** * @brief The method returns collection accessibility addresses representing objects connected with current object @@ -484,14 +479,14 @@ DALI_TOOLKIT_API void RemoveAccessibilityRelation(Dali::Actor control, Actor des * @param control object to append attribute to * @return std::vector, where index is casted value of Accessibility::RelationType and value is std::vector of type Accessibility::Address */ -DALI_TOOLKIT_API std::vector> GetAccessibilityRelations(Dali::Actor control); +DALI_TOOLKIT_API std::vector> GetAccessibilityRelations(Toolkit::Control 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(Toolkit::Control control); /** * @brief The method allows to add or modify value matched with given key. @@ -501,21 +496,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(Toolkit::Control 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(Toolkit::Control 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(Toolkit::Control control); /** * @brief The method inserts reading information of an accessible object into attributes @@ -523,7 +518,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(Toolkit::Control control, const Dali::Accessibility::ReadingInfoTypes types); /** * @brief The method returns reading information of an accessible object @@ -531,7 +526,7 @@ DALI_TOOLKIT_API void SetAccessibilityReadingInfoType(Dali::Actor control, const * @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(Toolkit::Control control); /** * @brief The method erases highlight. @@ -539,7 +534,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(Toolkit::Control control); /** * @brief The method grabs highlight. @@ -547,7 +542,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(Toolkit::Control control); /** * @brief The metod presents bitset of control's states. @@ -555,16 +550,16 @@ 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(Toolkit::Control control); /** * @brief The method force sending notifications about current states to accessibility clients * * @param control object to append attribute to - * @param states mask with states expected to broadcast - * @param isRecursive flag pointing if notifications of children's state would be sent + * @param states mask with states expected to broadcast + * @param recurse flag pointing if notifications of children's state would be sent */ -DALI_TOOLKIT_API void NotifyAccessibilityStateChange(Dali::Actor control, Dali::Accessibility::States states, bool isRecursive); +DALI_TOOLKIT_API void NotifyAccessibilityStateChange(Toolkit::Control control, Dali::Accessibility::States states, bool recurse); /** * The method allows to set specific constructor for creating accessibility structure @@ -575,22 +570,14 @@ DALI_TOOLKIT_API void NotifyAccessibilityStateChange(Dali::Actor control, Dali:: * * Possible usage can be as follows: * @code - * SetAccessibilityConstructor( []( Dali::Actor actor ) { - return std::unique_ptr< Dali::Accessibility::Accessible >( - new AccessibleImpl( actor, Dali::Accessibility::Role::DIALOG, true ) ); - } ); + * SetAccessibilityConstructor([](Dali::Actor actor) { + return std::make_unique(actor, Dali::Accessibility::Role::DIALOG, true)); + }); * @endcode * * param constructor callback creating Accessible object */ -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 void SetAccessibilityConstructor(Dali::Actor control, std::function(Dali::Actor)> constructor); } // namespace DevelControl