X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fcontrol-devel.cpp;h=7b497c9801571854d249a85757de241ad6739811;hb=c4636249c15bf97b972dadf60a0070aae531ed5e;hp=157051ba1705204de7a769897c598f8364202040;hpb=2ca1c3856ce848a94f54444f1014a820e91ee207;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/controls/control-devel.cpp b/dali-toolkit/devel-api/controls/control-devel.cpp index 157051b..7b497c9 100644 --- a/dali-toolkit/devel-api/controls/control-devel.cpp +++ b/dali-toolkit/devel-api/controls/control-devel.cpp @@ -122,113 +122,89 @@ Dali::Property GetVisualProperty(Control control, Dali::Property::Index index, D return controlDataImpl.GetVisualProperty(index, visualPropertyKey); } -static Toolkit::Internal::Control::Impl* GetControlImplementationIfAny(Dali::Actor actor) +static Toolkit::Internal::Control::Impl* GetControlImplementation(Dali::Actor actor) { - Dali::Toolkit::Control c = Toolkit::Control::DownCast(actor); - if(c) + Dali::Toolkit::Control control = Toolkit::Control::DownCast(actor); + if(control) { - auto& impl1 = Toolkit::Internal::GetImplementation(c); - auto& impl2 = Toolkit::Internal::Control::Impl::Get(impl1); - return &impl2; + 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) { - auto ac = GetControlImplementationIfAny(control); - return ac->mAccessibilityActivateSignal; + return GetControlImplementation(control)->mAccessibilityActivateSignal; } 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) { - auto ac = GetControlImplementationIfAny(control); - return ac->mAccessibilityReadingPausedSignal; + return GetControlImplementation(control)->mAccessibilityReadingPausedSignal; } 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) { - auto ac = GetControlImplementationIfAny(control); - return ac->mAccessibilityReadingCancelledSignal; + return GetControlImplementation(control)->mAccessibilityReadingCancelledSignal; } 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) { - auto ac = GetControlImplementationIfAny(control); - return ac->mAccessibilityGetNameSignal; + return GetControlImplementation(control)->mAccessibilityGetNameSignal; } 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) { - auto ac = GetControlImplementationIfAny(control); - return ac->mAccessibilityDoGestureSignal; + return GetControlImplementation(control)->mAccessibilityDoGestureSignal; } void AppendAccessibilityRelation(Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - auto index = static_cast(relation); - if(index >= ac->mAccessibilityRelations.size()) + auto object = controlDataImpl->GetAccessibilityObject(destination); + if(object) { - DALI_LOG_ERROR("Relation index exceeds vector size."); - return; + controlDataImpl->mAccessibilityRelations[relation].insert(object); } - - auto obj = ac->GetAccessibilityObject(destination); - if(obj) - ac->mAccessibilityRelations[index].push_back(obj->GetAddress()); } } void RemoveAccessibilityRelation(Dali::Actor control, Actor destination, Dali::Accessibility::RelationType relation) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - auto index = static_cast(relation); - if(index >= ac->mAccessibilityRelations.size()) + auto object = controlDataImpl->GetAccessibilityObject(destination); + if(object) { - DALI_LOG_ERROR("Relation index exceeds vector size."); - return; - } + auto& relations = controlDataImpl->mAccessibilityRelations; - auto obj = ac->GetAccessibilityObject(destination); - if(!obj) - return; + relations[relation].erase(object); - auto address = obj->GetAddress(); - - auto& targets = ac->mAccessibilityRelations[index]; - for(auto i = 0u; i < targets.size(); ++i) - { - if(targets[i].ToString() == address.ToString()) + if(relations[relation].empty()) { - targets[i] = targets.back(); - targets.erase(targets.end() - 1); + relations.erase(relation); } } } @@ -236,110 +212,128 @@ void RemoveAccessibilityRelation(Dali::Actor control, Actor destination, Dali::A std::vector> GetAccessibilityRelations(Dali::Actor control) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - return ac->mAccessibilityRelations; + std::vector> result(static_cast(Accessibility::RelationType::MAX_COUNT)); + + // Map every Accessible* to its Address + for(auto& relation : controlDataImpl->mAccessibilityRelations) + { + auto index = static_cast(relation.first); + auto& targets = relation.second; + + std::transform(targets.begin(), targets.end(), std::back_inserter(result[index]), [](auto* x) { + return x->GetAddress(); + }); + } + + return result; } + return {}; } void ClearAccessibilityRelations(Dali::Actor control) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - for(auto& it : ac->mAccessibilityRelations) - it.clear(); + controlDataImpl->mAccessibilityRelations.clear(); } } -void SetAccessibilityConstructor(Dali::Actor control, - std::function(Dali::Actor)> constructor) +void SetAccessibilityConstructor(Dali::Actor control, std::function(Dali::Actor)> constructor) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - ac->accessibilityConstructor = constructor; + controlDataImpl->mAccessibilityConstructor = constructor; } } void AppendAccessibilityAttribute(Dali::Actor control, const std::string& key, const std::string value) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - ac->AppendAccessibilityAttribute(key, value); + controlDataImpl->AppendAccessibilityAttribute(key, value); } } void RemoveAccessibilityAttribute(Dali::Actor control, const std::string& key) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - ac->RemoveAccessibilityAttribute(key); + controlDataImpl->RemoveAccessibilityAttribute(key); } } void ClearAccessibilityAttributes(Dali::Actor control) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - ac->ClearAccessibilityAttributes(); + controlDataImpl->ClearAccessibilityAttributes(); } } void SetAccessibilityReadingInfoType(Dali::Actor control, const Dali::Accessibility::ReadingInfoTypes types) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - ac->SetAccessibilityReadingInfoType(types); + controlDataImpl->SetAccessibilityReadingInfoType(types); } } Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Dali::Actor control) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - return ac->GetAccessibilityReadingInfoType(); + return controlDataImpl->GetAccessibilityReadingInfoType(); } return {}; } bool ClearAccessibilityHighlight(Dali::Actor control) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - auto ptr = dynamic_cast(ac->GetAccessibilityObject()); - if(ptr) - return ptr->ClearHighlight(); + auto object = dynamic_cast(controlDataImpl->GetAccessibilityObject()); + if(object) + { + return object->ClearHighlight(); + } } return false; } bool GrabAccessibilityHighlight(Dali::Actor control) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - auto ptr = dynamic_cast(ac->GetAccessibilityObject()); - if(ptr) - return ptr->GrabHighlight(); + auto object = dynamic_cast(controlDataImpl->GetAccessibilityObject()); + if(object) + { + return object->GrabHighlight(); + } } return false; } Dali::Accessibility::States GetAccessibilityStates(Dali::Actor control) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - auto ptr = dynamic_cast(ac->GetAccessibilityObject()); - if(ptr) - return ptr->GetStates(); + auto object = dynamic_cast(controlDataImpl->GetAccessibilityObject()); + if(object) + { + return object->GetStates(); + } } return {}; } -void NotifyAccessibilityStateChange(Dali::Actor control, Dali::Accessibility::States states, bool doRecursive) +void NotifyAccessibilityStateChange(Dali::Actor control, Dali::Accessibility::States states, bool isRecursive) { - if(auto ac = GetControlImplementationIfAny(control)) + if(auto controlDataImpl = GetControlImplementation(control)) { - ac->GetAccessibilityObject()->NotifyAccessibilityStateChange(std::move(states), doRecursive); + controlDataImpl->GetAccessibilityObject()->NotifyAccessibilityStateChange(std::move(states), isRecursive); } }