[AT-SPI] Override IsScrollable for Scrollable

Change-Id: Iccee10708223938cc3fd74571331349e4437d609

diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
index 28e2e43..7077239 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
@@ -96,11 +96,16 @@ Scrollable::~Scrollable()
 {
 }
 
 {
 }
 

+bool Scrollable::AccessibleImpl::IsScrollable()
+{
+  return true;
+}
+

 void Scrollable::OnInitialize()
 {
   DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
     return std::unique_ptr< Dali::Accessibility::Accessible >(
 void Scrollable::OnInitialize()
 {
   DevelControl::SetAccessibilityConstructor( Self(), []( Dali::Actor actor ) {
     return std::unique_ptr< Dali::Accessibility::Accessible >(

-      new Control::Impl::AccessibleImpl( actor, Dali::Accessibility::Role::SCROLL_PANE ) );
+      new AccessibleImpl( actor, Dali::Accessibility::Role::SCROLL_PANE ) );

   } );
 }
 
   } );
 }
 

diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
index ee1e02c..9967fde 100644 (file)
--- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
+++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.h
@@ -24,6 +24,7 @@
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/scrollable/scrollable.h>

+#include <dali-toolkit/internal/controls/control/control-data-impl.h>

 
 namespace Dali
 {
 
 namespace Dali
 {


@@ -119,6 +120,12 @@ public:
   virtual void SetOvershootSize( const Vector2& size ) = 0;
 
 protected: // From Control
   virtual void SetOvershootSize( const Vector2& size ) = 0;
 
 protected: // From Control

+  struct AccessibleImpl : public Control::Impl::AccessibleImpl
+  {
+    using Control::Impl::AccessibleImpl::AccessibleImpl;
+
+    bool IsScrollable() override;
+  };

 
   /**
    * @copydoc Control::OnInitialize
 
   /**
    * @copydoc Control::OnInitialize