projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[AT-SPI] Follow-up on mAccessibilityRelations
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
accessible-impl.cpp
diff --git
a/dali-toolkit/devel-api/controls/accessible-impl.cpp
b/dali-toolkit/devel-api/controls/accessible-impl.cpp
index
a962abf
..
e01bcb5
100644
(file)
--- a/
dali-toolkit/devel-api/controls/accessible-impl.cpp
+++ b/
dali-toolkit/devel-api/controls/accessible-impl.cpp
@@
-536,23
+536,16
@@
std::vector<Dali::Accessibility::Relation> AccessibleImpl::GetRelationSet()
std::vector<Dali::Accessibility::Relation> ret;
std::vector<Dali::Accessibility::Relation> ret;
- auto& relations = controlImpl.mAccessibilityRelations;
- for(auto i = 0u; i < relations.size(); ++i)
+ for(auto& relation : controlImpl.mAccessibilityRelations)
{
{
- auto&
relation = relations[i]
;
+ auto&
targets = relation.second
;
- if(relation.empty())
- {
- continue;
- }
+ ret.emplace_back(Accessibility::Relation{relation.first, {}});
// Map every Accessible* to its Address
// Map every Accessible* to its Address
- std::vector<Accessibility::Address> targets;
- std::transform(relation.begin(), relation.end(), std::back_inserter(targets), [](auto* x) {
+ std::transform(targets.begin(), targets.end(), std::back_inserter(ret.back().targets), [](auto* x) {
return x->GetAddress();
});
return x->GetAddress();
});
-
- ret.emplace_back(Accessibility::Relation{static_cast<Accessibility::RelationType>(i), std::move(targets)});
}
return ret;
}
return ret;