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] Rename AccessibleImpl to <Control>Accessible
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
popup
/
popup-impl.cpp
diff --git
a/dali-toolkit/internal/controls/popup/popup-impl.cpp
b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index
5331e74
..
cf4e02c
100644
(file)
--- a/
dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/
dali-toolkit/internal/controls/popup/popup-impl.cpp
@@
-343,10
+343,10
@@
void Popup::OnInitialize()
SetupTouch();
SetupTouch();
- DevelControl::AppendAccessibilityAttribute(
self
, "sub-role", "Alert");
+ DevelControl::AppendAccessibilityAttribute(
Toolkit::Control::DownCast(self)
, "sub-role", "Alert");
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
- return std::
unique_ptr<Dali::Accessibility::Accessible>(new AccessibleImpl(actor, Dali::Accessibility::Role::DIALOG, true)
);
+ return std::
make_unique<PopupAccessible>(actor, Dali::Accessibility::Role::DIALOG, true
);
});
}
});
}
@@
-1994,7
+1994,7
@@
void Popup::SetupTouch()
}
}
}
}
-std::string Popup::
AccessibleImpl
::GetNameRaw() const
+std::string Popup::
PopupAccessible
::GetNameRaw() const
{
auto popup = Toolkit::Popup::DownCast(Self());
std::string title;
{
auto popup = Toolkit::Popup::DownCast(Self());
std::string title;
@@
-2016,7
+2016,7
@@
std::string Popup::AccessibleImpl::GetNameRaw() const
return title;
}
return title;
}
-Dali::Accessibility::States Popup::
AccessibleImpl
::CalculateStates()
+Dali::Accessibility::States Popup::
PopupAccessible
::CalculateStates()
{
auto states = DevelControl::ControlAccessible::CalculateStates();
auto popup = Toolkit::Popup::DownCast(Self());
{
auto states = DevelControl::ControlAccessible::CalculateStates();
auto popup = Toolkit::Popup::DownCast(Self());