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.2.49] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
item-view
/
item-view-impl.h
diff --git
a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
index
7e3d8c1
..
b388e22
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
+++ b/
dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h
@@
-419,6
+419,11
@@
private: // From Control
void OnInitialize() override;
/**
void OnInitialize() override;
/**
+ * @copydoc Toolkit::Internal::Control::CreateAccessibleObject()
+ */
+ DevelControl::ControlAccessible* CreateAccessibleObject() override;
+
+ /**
* @copydoc Toolkit::Control::OnAccessibilityPan()
*/
bool OnAccessibilityPan(PanGesture gesture) override;
* @copydoc Toolkit::Control::OnAccessibilityPan()
*/
bool OnAccessibilityPan(PanGesture gesture) override;
@@
-434,10
+439,14
@@
private: // From Control
void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) override;
protected:
void OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) override;
protected:
- struct AccessibleImpl : public Scrollable::AccessibleImpl
+ class ItemViewAccessible : public Scrollable::ScrollableAccessible
{
{
- using Scrollable::AccessibleImpl::AccessibleImpl;
+ public:
+ using Scrollable::ScrollableAccessible::ScrollableAccessible;
+ /**
+ * @copydoc Dali::Toolkit::DevelControl::ControlAccessible::ScrollToChild()
+ */
bool ScrollToChild(Actor child) override;
};
bool ScrollToChild(Actor child) override;
};