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
Merge "BorderlineColor allow Actor's OPACITY & MIX_COLOR" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
accessible-impl.h
diff --git
a/dali-toolkit/devel-api/controls/accessible-impl.h
b/dali-toolkit/devel-api/controls/accessible-impl.h
index
2a8ca3c
..
37e7ad3
100644
(file)
--- a/
dali-toolkit/devel-api/controls/accessible-impl.h
+++ b/
dali-toolkit/devel-api/controls/accessible-impl.h
@@
-47,13
+47,14
@@
struct DALI_TOOLKIT_API AccessibleImpl : public virtual Dali::Accessibility::Acc
public virtual Dali::Accessibility::Action
{
protected:
public virtual Dali::Accessibility::Action
{
protected:
- Dali::WeakHandle<Dali::Actor> self;
- Dali::WeakHandle<Dali::Actor> currentHighlightActor;
- bool modal = false, root = false;
+ Dali::WeakHandle<Dali::Actor> mSelf;
+ Dali::WeakHandle<Dali::Actor> mCurrentHighlightActor;
+ bool mIsModal = false;
+ bool mIsRoot = false;
Dali::Actor Self()
{
Dali::Actor Self()
{
- auto handle =
s
elf.GetHandle();
+ auto handle =
mS
elf.GetHandle();
// Control::Impl holds a std::unique_ptr to the Accessible object,
// so that one does not outlive the other.
// Control::Impl holds a std::unique_ptr to the Accessible object,
// so that one does not outlive the other.
@@
-130,7
+131,7
@@
public:
/**
* @copydoc Dali::Accessibility::Component::GetExtents()
*/
/**
* @copydoc Dali::Accessibility::Component::GetExtents()
*/
- Dali::Rect<> GetExtents(
Dali::Accessibility::CoordType c
type) override;
+ Dali::Rect<> GetExtents(
Accessibility::CoordinateType
type) override;
/**
* @copydoc Dali::Accessibility::Component::GetLayer()
/**
* @copydoc Dali::Accessibility::Component::GetLayer()