remove logic for comparing clipped state.

A child can be visible even if clip mode outside of parent.
So a object is actually shown on screen but SHOWING state is false.

Change-Id: I74b59f99783c6ade8029a3be5166cf9a8de36011

diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Accessible.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Accessible.cpp
index 60e1892..f76c4a0 100644 (file)
--- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Accessible.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Accessible.cpp
@@ -114,7 +114,7 @@ int UtcDaliAccessibilityCheckShowingState(void)
   q = Dali::Accessibility::Accessible::Get(buttonB);
   DALI_TEST_CHECK(q);
   states = q->GetStates();
-  DALI_TEST_EQUALS((int) states[Dali::Accessibility::State::SHOWING], (int) false, TEST_LOCATION);
+  DALI_TEST_EQUALS((int) states[Dali::Accessibility::State::SHOWING], (int) true, TEST_LOCATION);
 
   q = Dali::Accessibility::Accessible::Get(buttonC);
   DALI_TEST_CHECK(q);

diff --git a/dali-toolkit/devel-api/controls/control-accessible.cpp b/dali-toolkit/devel-api/controls/control-accessible.cpp
index 719657d..5ac6317 100644 (file)
--- a/dali-toolkit/devel-api/controls/control-accessible.cpp
+++ b/dali-toolkit/devel-api/controls/control-accessible.cpp
@@ -195,7 +195,6 @@ bool ControlAccessible::IsShowing()
     return true;
   }
 
-  auto childExtent = child->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
   while(parent)
   {
     auto control = Dali::Toolkit::Control::DownCast(parent->Self());
@@ -203,12 +202,6 @@ bool ControlAccessible::IsShowing()
     {
       return false;
     }
-    auto clipMode     = control.GetProperty(Actor::Property::CLIPPING_MODE).Get<bool>();
-    auto parentExtent = parent->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
-    if((clipMode != ClippingMode::DISABLED) && !parentExtent.Intersects(childExtent))
-    {
-      return false;
-    }
     parent = dynamic_cast<Toolkit::DevelControl::ControlAccessible*>(parent->GetParent());
   }