/*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
#include <dali/devel-api/actors/actor-devel.h>
#include <dali/devel-api/adaptor-framework/window-devel.h>
+#include <dali/public-api/object/type-info.h>
// INTERNAL INCLUDES
#include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
ControlAccessible::ControlAccessible(Dali::Actor self)
: ActorAccessible(self)
{
- auto control = Toolkit::Control::DownCast(self);
-
- Internal::Control& internalControl = Toolkit::Internal::GetImplementation(control);
- Internal::Control::Impl& controlImpl = Internal::Control::Impl::Get(internalControl);
-
- self.PropertySetSignal().Connect(&controlImpl, [this, &controlImpl](Dali::Handle& handle, Dali::Property::Index index, Dali::Property::Value value) {
- if(this->Self() != Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor())
- {
- return;
- }
-
- if(index == DevelControl::Property::ACCESSIBILITY_NAME || (index == GetNamePropertyIndex() && controlImpl.mAccessibilityName.empty()))
- {
- if(controlImpl.mAccessibilityGetNameSignal.Empty())
- {
- Emit(Dali::Accessibility::ObjectPropertyChangeEvent::NAME);
- }
- }
-
- if(index == DevelControl::Property::ACCESSIBILITY_DESCRIPTION || (index == GetDescriptionPropertyIndex() && controlImpl.mAccessibilityDescription.empty()))
- {
- if(controlImpl.mAccessibilityGetDescriptionSignal.Empty())
- {
- Emit(Dali::Accessibility::ObjectPropertyChangeEvent::DESCRIPTION);
- }
- }
- });
}
std::string ControlAccessible::GetName() const
Dali::Accessibility::Attributes ControlAccessible::GetAttributes() const
{
- std::unordered_map<std::string, std::string> attributeMap;
- auto control = Dali::Toolkit::Control::DownCast(Self());
- auto attribute = control.GetProperty(Dali::Toolkit::DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
- auto map = attribute.GetMap();
+ static const std::string automationIdKey = "automationId";
+ static const std::string classKey = "class";
- if(map)
+ Accessibility::Attributes result;
+ Toolkit::Control control = Toolkit::Control::DownCast(Self());
+ Dali::Property::Value property = control.GetProperty(DevelControl::Property::ACCESSIBILITY_ATTRIBUTES);
+ Dali::Property::Map* attributeMap = property.GetMap();
+ std::size_t attributeCount = attributeMap ? attributeMap->Count() : 0U;
+
+ for(std::size_t i = 0; i < attributeCount; i++)
{
- auto mapSize = map->Count();
+ Dali::Property::Key mapKey = attributeMap->GetKeyAt(i);
+ std::string mapValue;
- for(unsigned int i = 0; i < mapSize; i++)
+ if(mapKey.type == Dali::Property::Key::STRING && attributeMap->GetValue(i).Get(mapValue))
{
- auto mapKey = map->GetKeyAt(i);
- if(mapKey.type == Dali::Property::Key::STRING)
- {
- std::string mapValue;
- if(map->GetValue(i).Get(mapValue))
- {
- attributeMap.emplace(std::move(mapKey.stringKey), std::move(mapValue));
- }
- }
+ result.emplace(std::move(mapKey.stringKey), std::move(mapValue));
}
}
- auto automationId = control.GetProperty<std::string>(Dali::Toolkit::DevelControl::Property::AUTOMATION_ID);
+ auto automationId = control.GetProperty<std::string>(DevelControl::Property::AUTOMATION_ID);
if(!automationId.empty())
{
- attributeMap.emplace("automationId", std::move(automationId));
+ result.emplace(automationIdKey, std::move(automationId));
+ }
+
+ // Add "class" if not present already
+ if(result.find(classKey) == result.end())
+ {
+ Dali::TypeInfo typeInfo;
+ Self().GetTypeInfo(typeInfo);
+ if(typeInfo)
+ {
+ const std::string& typeName = typeInfo.GetName();
+
+ result.emplace(classKey, typeName);
+
+ // Save the 'typeName' so we don't have to calculate it again
+ DevelControl::AppendAccessibilityAttribute(control, classKey, typeName);
+ }
}
- return attributeMap;
+ return result;
}
bool ControlAccessible::IsHidden() const
controlImpl.UnregisterAccessibilityPositionPropertyNotification();
}
+void ControlAccessible::RegisterPropertySetSignal()
+{
+ auto control = Dali::Toolkit::Control::DownCast(Self());
+ Internal::Control& internalControl = Toolkit::Internal::GetImplementation(control);
+ Internal::Control::Impl& controlImpl = Internal::Control::Impl::Get(internalControl);
+ controlImpl.RegisterAccessibilityPropertySetSignal();
+}
+
+void ControlAccessible::UnregisterPropertySetSignal()
+{
+ auto control = Dali::Toolkit::Control::DownCast(Self());
+ Internal::Control& internalControl = Toolkit::Internal::GetImplementation(control);
+ Internal::Control::Impl& controlImpl = Internal::Control::Impl::Get(internalControl);
+ controlImpl.UnregisterAccessibilityPropertySetSignal();
+}
+
bool ControlAccessible::GrabHighlight()
{
Dali::Actor self = Self();
SetCurrentlyHighlightedActor(self);
EmitHighlighted(true);
RegisterPositionPropertyNotification();
+ RegisterPropertySetSignal();
return true;
}
if(GetCurrentlyHighlightedActor() == self)
{
+ UnregisterPropertySetSignal();
UnregisterPositionPropertyNotification();
self.Remove(mCurrentHighlightActor.GetHandle());
mCurrentHighlightActor = {};