#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali-toolkit/public-api/controls/control.h>
+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
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 object = controlDataImpl->GetAccessibilityObject(destination);
- if(object)
- {
- controlDataImpl->mAccessibilityRelations[relation].insert(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 object = controlDataImpl->GetAccessibilityObject(destination);
- if(object)
- {
- auto& relations = controlDataImpl->mAccessibilityRelations;
+ auto& relations = GetControlImplementation(control).mAccessibilityRelations;
- relations[relation].erase(object);
+ relations[relation].erase(destinationAccessible);
- if(relations[relation].empty())
- {
- relations.erase(relation);
- }
+ if(relations[relation].empty())
+ {
+ relations.erase(relation);
}
}
}
-std::vector<std::vector<Accessibility::Address>> GetAccessibilityRelations(Dali::Actor control)
+std::vector<Accessibility::Relation> GetAccessibilityRelations(Toolkit::Control control)
{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- std::vector<std::vector<Accessibility::Address>> result(static_cast<std::size_t>(Accessibility::RelationType::MAX_COUNT));
+ const auto& relations = GetControlImplementation(control).mAccessibilityRelations;
+ std::vector<Accessibility::Relation> result;
- // Map every Accessible* to its Address
- for(auto& relation : controlDataImpl->mAccessibilityRelations)
- {
- auto index = static_cast<std::size_t>(relation.first);
- auto& targets = relation.second;
-
- std::transform(targets.begin(), targets.end(), std::back_inserter(result[index]), [](auto* x) {
- return x->GetAddress();
- });
- }
+ for(auto& relation : relations)
+ {
+ auto& targets = relation.second;
- return result;
+ result.emplace_back(Accessibility::Relation{relation.first, {}});
+ std::copy(targets.begin(), targets.end(), std::back_inserter(result.back().mTargets));
}
- return {};
+ return result;
}
-void ClearAccessibilityRelations(Dali::Actor control)
+void ClearAccessibilityRelations(Toolkit::Control control)
{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- controlDataImpl->mAccessibilityRelations.clear();
- }
+ GetControlImplementation(control).mAccessibilityRelations.clear();
}
-void SetAccessibilityConstructor(Dali::Actor control, std::function<std::unique_ptr<Dali::Accessibility::Accessible>(Dali::Actor)> constructor)
+void AppendAccessibilityAttribute(Toolkit::Control control, const std::string& key, const std::string& value)
{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- controlDataImpl->mAccessibilityConstructor = constructor;
- }
+ GetControlImplementation(control).AppendAccessibilityAttribute(key, value);
}
-void AppendAccessibilityAttribute(Dali::Actor control, const std::string& key, const std::string value)
+void RemoveAccessibilityAttribute(Toolkit::Control control, const std::string& key)
{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- controlDataImpl->AppendAccessibilityAttribute(key, value);
- }
+ GetControlImplementation(control).RemoveAccessibilityAttribute(key);
}
-void RemoveAccessibilityAttribute(Dali::Actor control, const std::string& key)
+void ClearAccessibilityAttributes(Toolkit::Control control)
{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- controlDataImpl->RemoveAccessibilityAttribute(key);
- }
+ GetControlImplementation(control).ClearAccessibilityAttributes();
}
-void ClearAccessibilityAttributes(Dali::Actor control)
+void SetAccessibilityReadingInfoType(Toolkit::Control control, const Dali::Accessibility::ReadingInfoTypes types)
{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- controlDataImpl->ClearAccessibilityAttributes();
- }
+ GetControlImplementation(control).SetAccessibilityReadingInfoType(types);
}
-void SetAccessibilityReadingInfoType(Dali::Actor control, const Dali::Accessibility::ReadingInfoTypes types)
+Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Toolkit::Control control)
{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- controlDataImpl->SetAccessibilityReadingInfoType(types);
- }
+ return GetControlImplementation(control).GetAccessibilityReadingInfoType();
}
-Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Dali::Actor control)
+bool ClearAccessibilityHighlight(Toolkit::Control control)
{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- return controlDataImpl->GetAccessibilityReadingInfoType();
- }
- return {};
+ return GetControlImplementation(control).GetAccessibleObject()->ClearHighlight();
}
-bool ClearAccessibilityHighlight(Dali::Actor control)
+bool GrabAccessibilityHighlight(Toolkit::Control control)
{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- auto object = dynamic_cast<Dali::Accessibility::Component*>(controlDataImpl->GetAccessibilityObject());
- if(object)
- {
- return object->ClearHighlight();
- }
- }
- return false;
+ return GetControlImplementation(control).GetAccessibleObject()->GrabHighlight();
}
-bool GrabAccessibilityHighlight(Dali::Actor control)
+Dali::Accessibility::States GetAccessibilityStates(Toolkit::Control control)
{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- auto object = dynamic_cast<Dali::Accessibility::Component*>(controlDataImpl->GetAccessibilityObject());
- if(object)
- {
- return object->GrabHighlight();
- }
- }
- return false;
-}
-
-Dali::Accessibility::States GetAccessibilityStates(Dali::Actor control)
-{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- auto object = dynamic_cast<Dali::Accessibility::Component*>(controlDataImpl->GetAccessibilityObject());
- if(object)
- {
- return object->GetStates();
- }
- }
- return {};
+ return GetControlImplementation(control).GetAccessibleObject()->GetStates();
}
-void NotifyAccessibilityStateChange(Dali::Actor control, Dali::Accessibility::States states, bool isRecursive)
+void NotifyAccessibilityStateChange(Toolkit::Control control, Dali::Accessibility::States states, bool recurse)
{
- if(auto controlDataImpl = GetControlImplementation(control))
- {
- controlDataImpl->GetAccessibilityObject()->NotifyAccessibilityStateChange(std::move(states), isRecursive);
- }
+ GetControlImplementation(control).GetAccessibleObject()->NotifyAccessibilityStateChange(std::move(states), recurse);
}
} // namespace DevelControl
projects / platform / core / uifw / dali-toolkit.git / blobdiff