From d63464d6e06651d0d5053499f9bbcbb6a6088f32 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Artur=20=C5=9Awigo=C5=84?= <a.swigon@samsung.com>
Date: Thu, 10 Sep 2020 18:14:59 +0200
Subject: [PATCH] [AT-SPI] Override IsScrollable for Scrollable

Change-Id: Iccee10708223938cc3fd74571331349e4437d609
---
 dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp | 7 ++++++-
 dali-toolkit/internal/controls/scrollable/scrollable-impl.h   | 7 +++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
index 28e2e43..7077239 100644
--- 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 >(
-      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
--- 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>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
 
 namespace Dali
 {
@@ -119,6 +120,12 @@ public:
   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
-- 
2.7.4