[dali_2.3.24] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / scrollable / item-view / item-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
index 699aee4..fbf63f6 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp
@@ -367,9 +367,12 @@ void ItemView::OnInitialize()
   // Connect wheel event
   self.WheelEventSignal().Connect(this, &ItemView::OnWheelEvent);
 
-  DevelControl::SetAccessibilityConstructor(self, [](Dali::Actor actor) {
-    return std::unique_ptr<Dali::Accessibility::Accessible>(new AccessibleImpl(actor, Dali::Accessibility::Role::SCROLL_PANE));
-  });
+  self.SetProperty(DevelControl::Property::ACCESSIBILITY_ROLE, Dali::Accessibility::Role::SCROLL_PANE);
+}
+
+DevelControl::ControlAccessible* ItemView::CreateAccessibleObject()
+{
+  return new ItemViewAccessible(Self());
 }
 
 ItemView::~ItemView()
@@ -1345,11 +1348,11 @@ void ItemView::OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor)
   }
 }
 
-void ItemView::AccessibleImpl::EnsureChildVisible(Actor child)
+bool ItemView::ItemViewAccessible::ScrollToChild(Actor child)
 {
-  EnsureSelfVisible();
-  auto itemView = Dali::Toolkit::ItemView::DownCast(self);
+  auto itemView = Dali::Toolkit::ItemView::DownCast(Self());
   Toolkit::GetImpl(itemView).OnKeyboardFocusChangeCommitted(child);
+  return true;
 }
 
 Animation ItemView::DoAnchoring()
@@ -1917,8 +1920,7 @@ Property::Value ItemView::GetProperty(BaseObject* object, Property::Index index)
 
       case Toolkit::ItemView::Property::LAYOUT:
       {
-        Property::Array layouts = itemViewImpl.GetLayoutArray();
-        value                   = layouts;
+        value = itemViewImpl.GetLayoutArray();
         break;
       }
     }