X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-devel.cpp;h=51e056489db995c25edb35a5c32061c60b0267e8;hp=a855b2ddc92fc1dc20c4351a68e2d1fa22a652ff;hb=d386c8d8e05053cef41a20db9727065aee3d2bd4;hpb=1fe6286be11679b2f5c14a60636ae9cb486570e4 diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp index a855b2d..51e0564 100644 --- a/dali-toolkit/devel-api/controls/control-devel.cpp +++ b/dali-toolkit/devel-api/controls/control-devel.cpp @@ -1,5 +1,5 @@ /* - * 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. @@ -25,8 +25,19 @@ // INTERNAL INCLUDES #include #include -#include #include +#include + +namespace +{ +Dali::Toolkit::Internal::Control::Impl& GetControlImplementation(Dali::Toolkit::Control control) +{ + auto& internalControl = Dali::Toolkit::Internal::GetImplementation(control); + + return Dali::Toolkit::Internal::Control::Impl::Get(internalControl); +} + +} // unnamed namespace namespace Dali { @@ -115,230 +126,145 @@ VisualEventSignalType& VisualEventSignal(Control control) return controlDataImpl.VisualEventSignal(); } -static Toolkit::Internal::Control::Impl *GetControlImplementationIfAny( Dali::Actor actor) +Dali::Property GetVisualProperty(Control control, Dali::Property::Index index, Dali::Property::Key visualPropertyKey) { - Dali::Toolkit::Control c = Toolkit::Control::DownCast( actor ); - if ( c ) - { - auto &impl1 = Toolkit::Internal::GetImplementation( c ); - auto &impl2 = Toolkit::Internal::Control::Impl::Get( impl1 ); - return &impl2; - } - return nullptr; + Internal::Control& internalControl = Toolkit::Internal::GetImplementation(control); + Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(internalControl); + return controlDataImpl.GetVisualProperty(index, visualPropertyKey); } -Toolkit::DevelControl::AccessibilityActivateSignalType &AccessibilityActivateSignal( Toolkit::Control control ) +Toolkit::DevelControl::AccessibilityActivateSignalType& AccessibilityActivateSignal(Toolkit::Control control) { - auto ac = GetControlImplementationIfAny ( control ); - return ac->mAccessibilityActivateSignal; + return GetControlImplementation(control).mAccessibilityActivateSignal; } -Toolkit::DevelControl::AccessibilityReadingSkippedSignalType &AccessibilityReadingSkippedSignal( Toolkit::Control control ) +Toolkit::DevelControl::AccessibilityReadingSkippedSignalType& AccessibilityReadingSkippedSignal(Toolkit::Control control) { - auto ac = GetControlImplementationIfAny ( control ); - return ac->mAccessibilityReadingSkippedSignal; + return GetControlImplementation(control).mAccessibilityReadingSkippedSignal; } -Toolkit::DevelControl::AccessibilityReadingPausedSignalType &AccessibilityReadingPausedSignal( Toolkit::Control control ) +Toolkit::DevelControl::AccessibilityReadingPausedSignalType& AccessibilityReadingPausedSignal(Toolkit::Control control) { - auto ac = GetControlImplementationIfAny ( control ); - return ac->mAccessibilityReadingPausedSignal; + return GetControlImplementation(control).mAccessibilityReadingPausedSignal; } -Toolkit::DevelControl::AccessibilityReadingResumedSignalType &AccessibilityReadingResumedSignal( Toolkit::Control control ) +Toolkit::DevelControl::AccessibilityReadingResumedSignalType& AccessibilityReadingResumedSignal(Toolkit::Control control) { - auto ac = GetControlImplementationIfAny ( control ); - return ac->mAccessibilityReadingResumedSignal; + return GetControlImplementation(control).mAccessibilityReadingResumedSignal; } -Toolkit::DevelControl::AccessibilityReadingCancelledSignalType &AccessibilityReadingCancelledSignal( Toolkit::Control control ) +Toolkit::DevelControl::AccessibilityReadingCancelledSignalType& AccessibilityReadingCancelledSignal(Toolkit::Control control) { - auto ac = GetControlImplementationIfAny ( control ); - return ac->mAccessibilityReadingCancelledSignal; + return GetControlImplementation(control).mAccessibilityReadingCancelledSignal; } -Toolkit::DevelControl::AccessibilityReadingStoppedSignalType &AccessibilityReadingStoppedSignal( Toolkit::Control control ) +Toolkit::DevelControl::AccessibilityReadingStoppedSignalType& AccessibilityReadingStoppedSignal(Toolkit::Control control) { - auto ac = GetControlImplementationIfAny ( control ); - return ac->mAccessibilityReadingStoppedSignal; + return GetControlImplementation(control).mAccessibilityReadingStoppedSignal; } -Toolkit::DevelControl::AccessibilityGetNameSignalType &AccessibilityGetNameSignal( Toolkit::Control control ) +Toolkit::DevelControl::AccessibilityGetNameSignalType& AccessibilityGetNameSignal(Toolkit::Control control) { - auto ac = GetControlImplementationIfAny ( control ); - return ac->mAccessibilityGetNameSignal; + return GetControlImplementation(control).mAccessibilityGetNameSignal; } -Toolkit::DevelControl::AccessibilityGetDescriptionSignalType &AccessibilityGetDescriptionSignal( Toolkit::Control control ) +Toolkit::DevelControl::AccessibilityGetDescriptionSignalType& AccessibilityGetDescriptionSignal(Toolkit::Control control) { - auto ac = GetControlImplementationIfAny ( control ); - return ac->mAccessibilityGetDescriptionSignal; + return GetControlImplementation(control).mAccessibilityGetDescriptionSignal; } -Toolkit::DevelControl::AccessibilityDoGestureSignalType &AccessibilityDoGestureSignal( Toolkit::Control control ) +Toolkit::DevelControl::AccessibilityDoGestureSignalType& AccessibilityDoGestureSignal(Toolkit::Control control) { - auto ac = GetControlImplementationIfAny ( control ); - return ac->mAccessibilityDoGestureSignal; + return GetControlImplementation(control).mAccessibilityDoGestureSignal; } -void AppendAccessibilityRelation( Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation) +void AppendAccessibilityRelation(Toolkit::Control control, Dali::Actor destination, Dali::Accessibility::RelationType relation) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) + if(auto destinationAccessible = Accessibility::Accessible::Get(destination)) { - auto index = static_cast(relation); - if (index >= ac->mAccessibilityRelations.size()) - { - DALI_LOG_ERROR( "Relation index exceeds vector size." ); - return; - } - - auto obj = ac->GetAccessibilityObject(destination); - if (obj) - ac->mAccessibilityRelations[index].push_back(obj->GetAddress()); + GetControlImplementation(control).mAccessibilityRelations[relation].insert(destinationAccessible); } } -void RemoveAccessibilityRelation( Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation) +void RemoveAccessibilityRelation(Toolkit::Control control, Dali::Actor destination, Dali::Accessibility::RelationType relation) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) + if(auto destinationAccessible = Accessibility::Accessible::Get(destination)) { - auto index = static_cast(relation); - if (index >= ac->mAccessibilityRelations.size()) - { - DALI_LOG_ERROR( "Relation index exceeds vector size." ); - return; - } - - auto obj = ac->GetAccessibilityObject(destination); - if (!obj) - return; + auto& relations = GetControlImplementation(control).mAccessibilityRelations; - auto address = obj->GetAddress(); + relations[relation].erase(destinationAccessible); - auto &targets = ac->mAccessibilityRelations[index]; - for (auto i = 0u; i < targets.size(); ++i) { - if (targets[i].ToString() == address.ToString()) - { - targets[i] = targets.back(); - targets.erase(targets.end() - 1); - } + if(relations[relation].empty()) + { + relations.erase(relation); } } } -std::vector> GetAccessibilityRelations( Dali::Actor control ) +std::vector GetAccessibilityRelations(Toolkit::Control control) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) - { - return ac->mAccessibilityRelations; - } - return {}; -} + const auto& relations = GetControlImplementation(control).mAccessibilityRelations; + std::vector result; -void ClearAccessibilityRelations( Dali::Actor control ) -{ - if ( auto ac = GetControlImplementationIfAny ( control ) ) + for(auto& relation : relations) { - for (auto &it : ac->mAccessibilityRelations) - it.clear(); - } -} + auto& targets = relation.second; -void SetAccessibilityConstructor( Dali::Actor control, - std::function< std::unique_ptr< Dali::Accessibility::Accessible >( Dali::Actor ) > constructor ) -{ - if ( auto ac = GetControlImplementationIfAny ( control ) ) - { - ac->accessibilityConstructor = constructor; + result.emplace_back(Accessibility::Relation{relation.first, {}}); + std::copy(targets.begin(), targets.end(), std::back_inserter(result.back().mTargets)); } + + return result; } -void AppendAccessibilityAttribute( Dali::Actor control, const std::string& key, - const std::string value ) +void ClearAccessibilityRelations(Toolkit::Control control) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) - { - ac->AppendAccessibilityAttribute( key, value ); - } + GetControlImplementation(control).mAccessibilityRelations.clear(); } -void RemoveAccessibilityAttribute( Dali::Actor control, const std::string& key ) +void AppendAccessibilityAttribute(Toolkit::Control control, const std::string& key, const std::string& value) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) - { - ac->RemoveAccessibilityAttribute( key ); - } + GetControlImplementation(control).AppendAccessibilityAttribute(key, value); } -void ClearAccessibilityAttributes( Dali::Actor control ) +void RemoveAccessibilityAttribute(Toolkit::Control control, const std::string& key) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) - { - ac->ClearAccessibilityAttributes(); - } + GetControlImplementation(control).RemoveAccessibilityAttribute(key); } -void SetAccessibilityReadingInfoType( Dali::Actor control, const Dali::Accessibility::ReadingInfoTypes types ) +void ClearAccessibilityAttributes(Toolkit::Control control) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) - { - ac->SetAccessibilityReadingInfoType( types ); - } + GetControlImplementation(control).ClearAccessibilityAttributes(); } -Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Dali::Actor control ) +void SetAccessibilityReadingInfoType(Toolkit::Control control, const Dali::Accessibility::ReadingInfoTypes types) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) - { - return ac->GetAccessibilityReadingInfoType(); - } - return {}; + GetControlImplementation(control).SetAccessibilityReadingInfoType(types); } -bool ClearAccessibilityHighlight( Dali::Actor control ) +Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Toolkit::Control control) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) - { - auto ptr = dynamic_cast( ac->GetAccessibilityObject() ); - if( ptr ) - return ptr->ClearHighlight(); - } - return false; + return GetControlImplementation(control).GetAccessibilityReadingInfoType(); } -bool GrabAccessibilityHighlight( Dali::Actor control ) +bool ClearAccessibilityHighlight(Toolkit::Control control) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) - { - auto ptr = dynamic_cast( ac->GetAccessibilityObject() ); - if( ptr ) - return ptr->GrabHighlight(); - } - return false; + return GetControlImplementation(control).GetAccessibleObject()->ClearHighlight(); } -Dali::Accessibility::States GetAccessibilityStates( Dali::Actor control ) +bool GrabAccessibilityHighlight(Toolkit::Control control) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) - { - auto ptr = dynamic_cast( ac->GetAccessibilityObject() ); - if(ptr) - return ptr->GetStates(); - } - return {}; + return GetControlImplementation(control).GetAccessibleObject()->GrabHighlight(); } -void NotifyAccessibilityStateChange( Dali::Actor control, Dali::Accessibility::States states, bool doRecursive ) +Dali::Accessibility::States GetAccessibilityStates(Toolkit::Control control) { - if ( auto ac = GetControlImplementationIfAny ( control ) ) - { - ac->GetAccessibilityObject()->NotifyAccessibilityStateChange( std::move(states), doRecursive ); - } + return GetControlImplementation(control).GetAccessibleObject()->GetStates(); } -Dali::Accessibility::Accessible *GetBoundAccessibilityObject( Dali::Actor control ) +void NotifyAccessibilityStateChange(Toolkit::Control control, Dali::Accessibility::States states, bool recurse) { - return Dali::Accessibility::Accessible::Get( control ); + GetControlImplementation(control).GetAccessibleObject()->NotifyAccessibilityStateChange(std::move(states), recurse); } } // namespace DevelControl