Merge "(Automated Tests) Added more tests to increase TEM score" into devel/master

[platform/core/uifw/dali-adaptor.git] / dali / internal / accessibility / bridge / component.cpp

diff --git a/dali/internal/accessibility/bridge/component.cpp b/dali/internal/accessibility/bridge/component.cpp
index 7e85d56..640f30f 100644 (file)
--- a/dali/internal/accessibility/bridge/component.cpp
+++ b/dali/internal/accessibility/bridge/component.cpp
@@ -21,31 +21,27 @@
 #include <iostream>
 
 // INTERNAL INCLUDES
+#include <dali/devel-api/atspi-interfaces/component.h>
 #include <dali/internal/accessibility/bridge/accessibility-common.h>
 
 using namespace Dali::Accessibility;
 
-bool Component::Contains(Point p, CoordType ctype)
+bool Component::IsAccessibleContainingPoint(Point point, Dali::Accessibility::CoordinateType type) const
 {
-  auto extents = GetExtents(ctype);
-  return p.x >= extents.x && p.y >= extents.y && p.x <= extents.x + extents.width && p.y <= extents.y + extents.height;
+  auto extents = GetExtents(type);
+  return point.x >= extents.x && point.y >= extents.y && point.x <= extents.x + extents.width && point.y <= extents.y + extents.height;
 }
 
-Accessible* Component::GetAccessibleAtPoint(Point p, CoordType ctype)
+Accessible* Component::GetAccessibleAtPoint(Point point, Dali::Accessibility::CoordinateType type)
 {
   auto children = GetChildren();
   for(auto childIt = children.rbegin(); childIt != children.rend(); childIt++)
   {
     auto component = dynamic_cast<Component*>(*childIt);
-    if(component && component->Contains(p, ctype))
+    if(component && component->IsAccessibleContainingPoint(point, type))
     {
       return component;
     }
   }
   return nullptr;
 }
-
-bool Component::IsScrollable()
-{
-  return false;
-}