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 "Add ApplyCustomFragmentPrefix" 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
ed09487
..
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.
@@
-62,6
+63,8
@@
protected:
return handle;
}
return handle;
}
+ void ScrollToSelf();
+
public:
AccessibleImpl(Dali::Actor self, Dali::Accessibility::Role role, bool modal = false);
public:
AccessibleImpl(Dali::Actor self, Dali::Accessibility::Role role, bool modal = false);
@@
-111,6
+114,11
@@
public:
Dali::Accessibility::Role GetRole() override;
/**
Dali::Accessibility::Role GetRole() override;
/**
+ * @copydoc Dali::Accessibility::Accessible::GetLocalizedRoleName()
+ */
+ std::string GetLocalizedRoleName() override;
+
+ /**
* @copydoc Dali::Accessibility::Accessible::GetStates()
*/
Dali::Accessibility::States GetStates() override;
* @copydoc Dali::Accessibility::Accessible::GetStates()
*/
Dali::Accessibility::States GetStates() override;
@@
-123,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()
@@
-207,14
+215,9
@@
public:
/**
* @brief Makes sure that a given child of this container (e.g. ItemView) is visible
/**
* @brief Makes sure that a given child of this container (e.g. ItemView) is visible
+ * @return false if scrolling is not supported or child is already visible
*/
*/
- virtual void EnsureChildVisible(Actor child);
-
- /**
- * @brief Makes sure this actor is visible (when moving the highlight frame to an
- * actor that is scrolled out of the viewport)
- */
- virtual void EnsureSelfVisible();
+ virtual bool ScrollToChild(Actor child);
/**
* @brief Returns the index of the property that represents this actor's name
/**
* @brief Returns the index of the property that represents this actor's name