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
[dali_2.1.28] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scrollable-impl.h
diff --git
a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
index
4240a1e
..
5e30b86
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/scrollable-impl.h
+++ b/
dali-toolkit/internal/controls/scrollable/scrollable-impl.h
@@
-117,11
+117,15
@@
public:
virtual void SetOvershootSize(const Vector2& size) = 0;
protected: // From Control
virtual void SetOvershootSize(const Vector2& size) = 0;
protected: // From Control
- struct AccessibleImpl : public DevelControl::AccessibleImpl
+ class ScrollableAccessible : public DevelControl::ControlAccessible
{
{
- using DevelControl::AccessibleImpl::AccessibleImpl;
+ public:
+ using DevelControl::ControlAccessible::ControlAccessible;
- bool IsScrollable() override;
+ /**
+ * @copydoc Dali::Accessibility::Component::IsScrollable()
+ */
+ bool IsScrollable() const override;
};
/**
};
/**
@@
-129,6
+133,11
@@
protected: // From Control
*/
virtual void OnInitialize() override;
*/
virtual void OnInitialize() override;
+ /**
+ * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+ */
+ DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
private:
/**
* Temporary function to override EnableScrollOvershoot functionality for overshoot
private:
/**
* Temporary function to override EnableScrollOvershoot functionality for overshoot