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=ccf624baf35ea17b380fa312bd0fe550a205baa5;hb=d386c8d8e05053cef41a20db9727065aee3d2bd4;hpb=a9d56fc12792cd84a5d41568dc0bbf26157f4334 diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp index ccf624b..51e0564 100644 --- a/dali-toolkit/devel-api/controls/control-devel.cpp +++ b/dali-toolkit/devel-api/controls/control-devel.cpp @@ -28,6 +28,17 @@ #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 { namespace Toolkit @@ -122,246 +133,138 @@ Dali::Property GetVisualProperty(Control control, Dali::Property::Index index, D return controlDataImpl.GetVisualProperty(index, visualPropertyKey); } -static Toolkit::Internal::Control::Impl* GetControlImplementation(Dali::Actor actor) -{ - Dali::Toolkit::Control control = Toolkit::Control::DownCast(actor); - if(control) - { - auto& internalControl = Toolkit::Internal::GetImplementation(control); - auto& controlDataImpl = Toolkit::Internal::Control::Impl::Get(internalControl); - return &controlDataImpl; - } - return nullptr; -} - Toolkit::DevelControl::AccessibilityActivateSignalType& AccessibilityActivateSignal(Toolkit::Control control) { - return GetControlImplementation(control)->mAccessibilityActivateSignal; + return GetControlImplementation(control).mAccessibilityActivateSignal; } Toolkit::DevelControl::AccessibilityReadingSkippedSignalType& AccessibilityReadingSkippedSignal(Toolkit::Control control) { - return GetControlImplementation(control)->mAccessibilityReadingSkippedSignal; + return GetControlImplementation(control).mAccessibilityReadingSkippedSignal; } Toolkit::DevelControl::AccessibilityReadingPausedSignalType& AccessibilityReadingPausedSignal(Toolkit::Control control) { - return GetControlImplementation(control)->mAccessibilityReadingPausedSignal; + return GetControlImplementation(control).mAccessibilityReadingPausedSignal; } Toolkit::DevelControl::AccessibilityReadingResumedSignalType& AccessibilityReadingResumedSignal(Toolkit::Control control) { - return GetControlImplementation(control)->mAccessibilityReadingResumedSignal; + return GetControlImplementation(control).mAccessibilityReadingResumedSignal; } Toolkit::DevelControl::AccessibilityReadingCancelledSignalType& AccessibilityReadingCancelledSignal(Toolkit::Control control) { - return GetControlImplementation(control)->mAccessibilityReadingCancelledSignal; + return GetControlImplementation(control).mAccessibilityReadingCancelledSignal; } Toolkit::DevelControl::AccessibilityReadingStoppedSignalType& AccessibilityReadingStoppedSignal(Toolkit::Control control) { - return GetControlImplementation(control)->mAccessibilityReadingStoppedSignal; + return GetControlImplementation(control).mAccessibilityReadingStoppedSignal; } Toolkit::DevelControl::AccessibilityGetNameSignalType& AccessibilityGetNameSignal(Toolkit::Control control) { - return GetControlImplementation(control)->mAccessibilityGetNameSignal; + return GetControlImplementation(control).mAccessibilityGetNameSignal; } Toolkit::DevelControl::AccessibilityGetDescriptionSignalType& AccessibilityGetDescriptionSignal(Toolkit::Control control) { - return GetControlImplementation(control)->mAccessibilityGetDescriptionSignal; + return GetControlImplementation(control).mAccessibilityGetDescriptionSignal; } Toolkit::DevelControl::AccessibilityDoGestureSignalType& AccessibilityDoGestureSignal(Toolkit::Control control) { - return GetControlImplementation(control)->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 controlDataImpl = GetControlImplementation(control)) + if(auto destinationAccessible = Accessibility::Accessible::Get(destination)) { - auto index = static_cast(relation); - if(index >= controlDataImpl->mAccessibilityRelations.size()) - { - DALI_LOG_ERROR("Relation index exceeds vector size."); - return; - } - - auto object = controlDataImpl->GetAccessibilityObject(destination); - if(object) - { - controlDataImpl->mAccessibilityRelations[index].push_back(object); - } + 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 controlDataImpl = GetControlImplementation(control)) + if(auto destinationAccessible = Accessibility::Accessible::Get(destination)) { - auto index = static_cast(relation); - if(index >= controlDataImpl->mAccessibilityRelations.size()) - { - DALI_LOG_ERROR("Relation index exceeds vector size."); - return; - } + auto& relations = GetControlImplementation(control).mAccessibilityRelations; - auto object = controlDataImpl->GetAccessibilityObject(destination); - if(!object) - { - return; - } + relations[relation].erase(destinationAccessible); - auto& targets = controlDataImpl->mAccessibilityRelations[index]; - for(auto i = 0u; i < targets.size(); ++i) + if(relations[relation].empty()) { - if(targets[i] == object) - { - std::swap(targets[i], targets.back()); - targets.pop_back(); - --i; - } + relations.erase(relation); } } } -std::vector> GetAccessibilityRelations(Dali::Actor control) +std::vector GetAccessibilityRelations(Toolkit::Control control) { - if(auto controlDataImpl = GetControlImplementation(control)) - { - auto& relations = controlDataImpl->mAccessibilityRelations; - - std::vector> result(relations.size()); - - // Map every Accessible* to its Address - for(std::size_t i = 0; i < relations.size(); ++i) - { - auto& relation = relations[i]; + const auto& relations = GetControlImplementation(control).mAccessibilityRelations; + std::vector result; - std::transform(relation.begin(), relation.end(), std::back_inserter(result[i]), [](auto* x) { - return x->GetAddress(); - }); - } - - return result; - } - - return {}; -} - -void ClearAccessibilityRelations(Dali::Actor control) -{ - if(auto controlDataImpl = GetControlImplementation(control)) + for(auto& relation : relations) { - for(auto& it : controlDataImpl->mAccessibilityRelations) - { - it.clear(); - } - } -} + auto& targets = relation.second; -void SetAccessibilityConstructor(Dali::Actor control, std::function(Dali::Actor)> constructor) -{ - if(auto controlDataImpl = GetControlImplementation(control)) - { - controlDataImpl->mAccessibilityConstructor = 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 controlDataImpl = GetControlImplementation(control)) - { - controlDataImpl->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 controlDataImpl = GetControlImplementation(control)) - { - controlDataImpl->RemoveAccessibilityAttribute(key); - } + GetControlImplementation(control).AppendAccessibilityAttribute(key, value); } -void ClearAccessibilityAttributes(Dali::Actor control) +void RemoveAccessibilityAttribute(Toolkit::Control control, const std::string& key) { - if(auto controlDataImpl = GetControlImplementation(control)) - { - controlDataImpl->ClearAccessibilityAttributes(); - } + GetControlImplementation(control).RemoveAccessibilityAttribute(key); } -void SetAccessibilityReadingInfoType(Dali::Actor control, const Dali::Accessibility::ReadingInfoTypes types) +void ClearAccessibilityAttributes(Toolkit::Control control) { - if(auto controlDataImpl = GetControlImplementation(control)) - { - controlDataImpl->SetAccessibilityReadingInfoType(types); - } + GetControlImplementation(control).ClearAccessibilityAttributes(); } -Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Dali::Actor control) +void SetAccessibilityReadingInfoType(Toolkit::Control control, const Dali::Accessibility::ReadingInfoTypes types) { - if(auto controlDataImpl = GetControlImplementation(control)) - { - return controlDataImpl->GetAccessibilityReadingInfoType(); - } - return {}; + GetControlImplementation(control).SetAccessibilityReadingInfoType(types); } -bool ClearAccessibilityHighlight(Dali::Actor control) +Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Toolkit::Control control) { - if(auto controlDataImpl = GetControlImplementation(control)) - { - auto object = dynamic_cast(controlDataImpl->GetAccessibilityObject()); - if(object) - { - return object->ClearHighlight(); - } - } - return false; + return GetControlImplementation(control).GetAccessibilityReadingInfoType(); } -bool GrabAccessibilityHighlight(Dali::Actor control) +bool ClearAccessibilityHighlight(Toolkit::Control control) { - if(auto controlDataImpl = GetControlImplementation(control)) - { - auto object = dynamic_cast(controlDataImpl->GetAccessibilityObject()); - if(object) - { - return object->GrabHighlight(); - } - } - return false; + return GetControlImplementation(control).GetAccessibleObject()->ClearHighlight(); } -Dali::Accessibility::States GetAccessibilityStates(Dali::Actor control) +bool GrabAccessibilityHighlight(Toolkit::Control control) { - if(auto controlDataImpl = GetControlImplementation(control)) - { - auto object = dynamic_cast(controlDataImpl->GetAccessibilityObject()); - if(object) - { - return object->GetStates(); - } - } - return {}; + return GetControlImplementation(control).GetAccessibleObject()->GrabHighlight(); } -void NotifyAccessibilityStateChange(Dali::Actor control, Dali::Accessibility::States states, bool isRecursive) +Dali::Accessibility::States GetAccessibilityStates(Toolkit::Control control) { - if(auto controlDataImpl = GetControlImplementation(control)) - { - controlDataImpl->GetAccessibilityObject()->NotifyAccessibilityStateChange(std::move(states), isRecursive); - } + 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