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] Require ControlAccessible for Control
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
control-devel.cpp
diff --git
a/dali-toolkit/devel-api/controls/control-devel.cpp
b/dali-toolkit/devel-api/controls/control-devel.cpp
index
a98cefe
..
a15e5a1
100644
(file)
--- a/
dali-toolkit/devel-api/controls/control-devel.cpp
+++ b/
dali-toolkit/devel-api/controls/control-devel.cpp
@@
-224,7
+224,7
@@
void ClearAccessibilityRelations(Toolkit::Control control)
GetControlImplementation(control).mAccessibilityRelations.clear();
}
GetControlImplementation(control).mAccessibilityRelations.clear();
}
-void SetAccessibilityConstructor(Dali::Actor control, std::function<std::unique_ptr<
Dali::Accessibility::
Accessible>(Dali::Actor)> constructor)
+void SetAccessibilityConstructor(Dali::Actor control, std::function<std::unique_ptr<
Toolkit::DevelControl::Control
Accessible>(Dali::Actor)> constructor)
{
GetControlImplementation(Toolkit::Control::DownCast(control)).mAccessibilityConstructor = constructor;
}
{
GetControlImplementation(Toolkit::Control::DownCast(control)).mAccessibilityConstructor = constructor;
}
@@
-256,28
+256,22
@@
Dali::Accessibility::ReadingInfoTypes GetAccessibilityReadingInfoType(Toolkit::C
bool ClearAccessibilityHighlight(Toolkit::Control control)
{
bool ClearAccessibilityHighlight(Toolkit::Control control)
{
- auto* accessible = Dali::Accessibility::Component::DownCast(GetControlImplementation(control).GetAccessibilityObject());
-
- return accessible ? accessible->ClearHighlight() : false;
+ return GetControlImplementation(control).GetAccessibleObject()->ClearHighlight();
}
bool GrabAccessibilityHighlight(Toolkit::Control control)
{
}
bool GrabAccessibilityHighlight(Toolkit::Control control)
{
- auto* accessible = Dali::Accessibility::Component::DownCast(GetControlImplementation(control).GetAccessibilityObject());
-
- return accessible ? accessible->GrabHighlight() : false;
+ return GetControlImplementation(control).GetAccessibleObject()->GrabHighlight();
}
Dali::Accessibility::States GetAccessibilityStates(Toolkit::Control control)
{
}
Dali::Accessibility::States GetAccessibilityStates(Toolkit::Control control)
{
- auto* accessible = GetControlImplementation(control).GetAccessibilityObject();
-
- return accessible->GetStates();
+ return GetControlImplementation(control).GetAccessibleObject()->GetStates();
}
void NotifyAccessibilityStateChange(Toolkit::Control control, Dali::Accessibility::States states, bool recurse)
{
}
void NotifyAccessibilityStateChange(Toolkit::Control control, Dali::Accessibility::States states, bool recurse)
{
- GetControlImplementation(control).GetAccessib
ility
Object()->NotifyAccessibilityStateChange(std::move(states), recurse);
+ GetControlImplementation(control).GetAccessib
le
Object()->NotifyAccessibilityStateChange(std::move(states), recurse);
}
} // namespace DevelControl
}
} // namespace DevelControl