Merge "[ATSPI] Fix for SCREEN coordinate type in GetExtents" into devel/master

diff --combined automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp
index 567ba61,1c24861..0b1ec0e
--- 1/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp
--- 2/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp
+++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp
@@@ -4,6 -4,7 +4,7 @@@
  #include <dali-toolkit/dali-toolkit.h>
  #include <dali/devel-api/adaptor-framework/accessibility.h>
  #include <dali/devel-api/adaptor-framework/accessibility-impl.h>
+ #include <dali/devel-api/adaptor-framework/window-devel.h>
  #include <dali-toolkit/devel-api/controls/buttons/toggle-button.h>
  #include <dali-toolkit/devel-api/controls/control-devel.h>
  #include <dali-toolkit/devel-api/controls/popup/popup.h>
@@@ -694,17 -695,102 +695,102 @@@ int UtcDaliAccessibilityGrabFocus(void
    END_TEST;
  }
  
- int UtcDaliAccessibilityGetExtents(void)
+ int UtcDaliAccessibilityGetExtentsScreenAndWindowPositionMatch(void)
  {
    ToolkitTestApplication application;
+   tet_infoline( "UtcDaliAccessibilityGetExtentsScreenAndWindowPositionMatch" );
  
    Dali::Accessibility::TestEnableSC( true );
  
    auto control = Control::New();
    Stage::GetCurrent().GetRootLayer().Add( control );
  
-   control.SetProperty(Actor::Property::POSITION, Vector3(10, 10, 100));
-   control.SetProperty(Actor::Property::SIZE, Vector2(10, 10));
+   auto window = Dali::DevelWindow::Get( control );
+   DALI_TEST_CHECK( window );
+ 
+   //window.SetPosition({0,0});
+   DevelWindow::SetPositionSize( window, PositionSize( 0,0,480, 240 ) );
+ 
+   control.SetProperty( Actor::Property::POSITION, Vector3( 10, 10, 100 ) );
+   control.SetProperty( Actor::Property::SIZE, Vector2( 10, 10 ) );
+ 
+   application.SendNotification();
+   application.Render( 1 );
+ 
+   auto a = Dali::Accessibility::Accessible::Get( control );
+   auto a_component = dynamic_cast<Dali::Accessibility::Component*>( a );
+ 
+   auto extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::SCREEN );
+   DALI_TEST_EQUALS( extents.x, 5.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.y, 5.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
+ 
+   auto bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::SCREEN );
+   DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 5, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 5, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
+ 
+   extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::WINDOW );
+   DALI_TEST_EQUALS( extents.x, 5.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.y, 5.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
+ 
+   bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::WINDOW );
+   DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 5, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 5, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
+ 
+   control.SetProperty( Dali::DevelActor::Property::POSITION_USES_ANCHOR_POINT, false );
+   application.SendNotification();
+   application.Render( 1 );
+ 
+   extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::SCREEN );
+   DALI_TEST_EQUALS( extents.x, 10.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.y, 10.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
+ 
+   bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::SCREEN );
+   DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 10, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 10, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
+ 
+   extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::WINDOW );
+   DALI_TEST_EQUALS( extents.x, 10.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.y, 10.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
+ 
+   bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::WINDOW );
+   DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 10, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 10, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
+ 
+   Dali::Accessibility::TestEnableSC( false );
+ 
+   END_TEST;
+ }
+ 
+ int UtcDaliAccessibilityGetExtentsScreenAndWindowPositionDoNotMatch(void)
+ {
+   ToolkitTestApplication application;
+ 
+   Dali::Accessibility::TestEnableSC( true );
+ 
+   auto control = Control::New();
+   Stage::GetCurrent().GetRootLayer().Add( control );
+   auto window = Dali::DevelWindow::Get( control );
+   //window.SetPosition({33,33});
+   DevelWindow::SetPositionSize( window, PositionSize( 33,33,480, 240 ) );
+ 
+   control.SetProperty( Actor::Property::POSITION, Vector3( 10, 10, 100 ) );
+   control.SetProperty( Actor::Property::SIZE, Vector2( 10, 10 ) );
  
    application.SendNotification();
    application.Render( 1 );
@@@ -712,13 -798,25 +798,25 @@@
    auto a = Dali::Accessibility::Accessible::Get( control );
    auto a_component = dynamic_cast<Dali::Accessibility::Component*>( a );
  
-   auto extents = a_component->GetExtents(Dali::Accessibility::CoordinateType::SCREEN);
+   auto extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::SCREEN );
+   DALI_TEST_EQUALS( extents.x, 38.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.y, 38.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
+ 
+   auto bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::SCREEN );
+   DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 38, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 38, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
+ 
+   extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::WINDOW );
    DALI_TEST_EQUALS( extents.x, 5.0f, TEST_LOCATION );
    DALI_TEST_EQUALS( extents.y, 5.0f, TEST_LOCATION );
    DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
    DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
  
-   auto bridge_extents = TestGetExtents( a_component -> GetAddress() );
+   bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::WINDOW );
    DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 5, TEST_LOCATION );
    DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 5, TEST_LOCATION );
    DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
@@@ -728,13 -826,25 +826,25 @@@
    application.SendNotification();
    application.Render( 1 );
  
-   extents = a_component->GetExtents(Dali::Accessibility::CoordinateType::SCREEN);
+   extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::SCREEN );
+   DALI_TEST_EQUALS( extents.x, 43.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.y, 43.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
+   DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
+ 
+   bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::SCREEN );
+   DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 43, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 43, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
+   DALI_TEST_EQUALS( std::get< 3 >( bridge_extents ), 10, TEST_LOCATION );
+ 
+   extents = a_component->GetExtents( Dali::Accessibility::CoordinateType::WINDOW );
    DALI_TEST_EQUALS( extents.x, 10.0f, TEST_LOCATION );
    DALI_TEST_EQUALS( extents.y, 10.0f, TEST_LOCATION );
    DALI_TEST_EQUALS( extents.height, 10.0f, TEST_LOCATION );
    DALI_TEST_EQUALS( extents.width, 10.0f, TEST_LOCATION );
  
-   bridge_extents = TestGetExtents( a_component -> GetAddress() );
+   bridge_extents = TestGetExtents( a_component -> GetAddress(), Dali::Accessibility::CoordinateType::WINDOW );
    DALI_TEST_EQUALS( std::get< 0 >( bridge_extents ), 10, TEST_LOCATION );
    DALI_TEST_EQUALS( std::get< 1 >( bridge_extents ), 10, TEST_LOCATION );
    DALI_TEST_EQUALS( std::get< 2 >( bridge_extents ), 10, TEST_LOCATION );
@@@ -1060,25 -1170,24 +1170,25 @@@ int UtcDaliAccessibilityCheckHighlight(
  
    // Make precondition two children exist in parent area
    PushButton parentButton = PushButton::New();
 +  parentButton.SetProperty(Actor::Property::CLIPPING_MODE, ClippingMode::CLIP_TO_BOUNDING_BOX);
    parentButton.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
    parentButton.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 -  parentButton.SetProperty( Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, 0.0f) );
 -  parentButton.SetProperty( Dali::Actor::Property::SIZE, Dali::Vector2(100.0f, 200.0f) );
 +  parentButton.SetProperty(Actor::Property::POSITION, Dali::Vector2(0.0f, 0.0f));
 +  parentButton.SetProperty(Actor::Property::SIZE, Dali::Vector2(100.0f, 200.0f));
    application.GetScene().Add( parentButton );
  
    PushButton buttonA = PushButton::New();
    buttonA.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
    buttonA.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 -  buttonA.SetProperty( Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, 0.0f) );
 -  buttonA.SetProperty( Dali::Actor::Property::SIZE, Dali::Vector2(100.0f, 100.0f) );
 +  buttonA.SetProperty(Actor::Property::POSITION, Dali::Vector2(0.0f, 0.0f));
 +  buttonA.SetProperty(Actor::Property::SIZE, Dali::Vector2(100.0f, 100.0f));
    parentButton.Add(buttonA);
  
    PushButton buttonB = PushButton::New();
    buttonB.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
    buttonB.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
 -  buttonB.SetProperty( Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, 100.0f) );
 -  buttonB.SetProperty( Dali::Actor::Property::SIZE, Dali::Vector2(100.0f, 100.0f) );
 +  buttonB.SetProperty(Actor::Property::POSITION, Dali::Vector2(0.0f, 100.0f));
 +  buttonB.SetProperty(Actor::Property::SIZE, Dali::Vector2(100.0f, 100.0f));
    parentButton.Add(buttonB);
    Wait(application);
  
@@@ -1089,9 -1198,9 +1199,9 @@@
    Wait(application);
  
    // Move first child (A) out of parent area through the parent's area top edge - single move outed event expected for A object and OUTGOING_TOP_LEFT direction
 -  buttonA.SetProperty( Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, -200.0f) );
 +  buttonA.SetProperty(Actor::Property::POSITION, Dali::Vector2(0.0f, -200.0f));
    Wait(application);
 -  // Need one more seding notificaiton to get correct updated position
 +  // Need one more notificaiton to get correct updated position
    application.SendNotification();
    DALI_TEST_EQUALS( true, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION );
  
@@@ -1101,7 -1210,7 +1211,7 @@@
    // Move first child (A) outside of parent area (both start and end position are outside of parent area) - no move outed event expected for A object
    buttonA.SetProperty( Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, -300.0f) );
    Wait(application);
 -  // Need one more seding notificaiton to get correct updated position
 +  // Need one more notificaiton to get correct updated position
    application.SendNotification();
    DALI_TEST_EQUALS( false, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION );
  
@@@ -1118,7 -1227,7 +1228,7 @@@
    // B: (0,100) --> (0, 50)
    buttonB.SetProperty( Dali::Actor::Property::POSITION, Dali::Vector2(0.0f, 50.0f) );
    Wait(application);
 -  // Need one more seding notificaiton to get correct updated position
 +  // Need one more notificaiton to get correct updated position
    application.SendNotification();
    DALI_TEST_EQUALS( false, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION );
  
@@@ -1126,9 -1235,9 +1236,9 @@@
    Dali::Accessibility::TestResetMoveOutedCalled();
  
    // Move second child (B) out of parent area through the parent's area right edge - single move outed event expected for B object and OUTGOING_BOTTOM_RIGHT direction
 -  buttonB.SetProperty( Dali::Actor::Property::POSITION, Dali::Vector2(300.0f, 100.0f) );
 +  buttonB.SetProperty(Actor::Property::POSITION, Dali::Vector2(300.0f, 100.0f));
    Wait(application);
 -  // Need one more seding notificaiton to get correct updated position
 +  // Need one more notificaiton to get correct updated position
    application.SendNotification();
    DALI_TEST_EQUALS( true, Dali::Accessibility::TestGetMoveOutedCalled(), TEST_LOCATION );
  

diff --combined dali-toolkit/devel-api/controls/accessible-impl.cpp
index ba1e0ed,b704578..9f1c78e
--- 1/dali-toolkit/devel-api/controls/accessible-impl.cpp
--- 2/dali-toolkit/devel-api/controls/accessible-impl.cpp
+++ b/dali-toolkit/devel-api/controls/accessible-impl.cpp
@@@ -24,6 -24,7 +24,7 @@@
  #endif
  
  #include <dali/devel-api/actors/actor-devel.h>
+ #include <dali/devel-api/adaptor-framework/window-devel.h>
  
  // INTERNAL INCLUDES
  #include <dali-toolkit/devel-api/asset-manager/asset-manager.h>
@@@ -199,37 -200,6 +200,37 @@@ std::string AccessibleImpl::GetLocalize
    return GetLocaleText(GetRoleName());
  }
  
 +bool AccessibleImpl::IsShowing()
 +{
 +  Dali::Actor self = Self();
 +  if(self.GetProperty(Dali::DevelActor::Property::CULLED).Get<bool>() || !self.GetCurrentProperty<bool>(Actor::Property::VISIBLE))
 +  {
 +    return false;
 +  }
 +
 +  auto* child  = this;
 +  auto* parent = dynamic_cast<Toolkit::DevelControl::AccessibleImpl*>(child->GetParent());
 +  if(!parent)
 +  {
 +    return true;
 +  }
 +
 +  auto childExtent = child->GetExtents(Dali::Accessibility::CoordinateType::WINDOW);
 +  while(parent)
 +  {
 +    auto control      = Dali::Toolkit::Control::DownCast(parent->Self());
 +    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::AccessibleImpl*>(parent->GetParent());
 +  }
 +
 +  return true;
 +}
 +
  Dali::Accessibility::States AccessibleImpl::CalculateStates()
  {
    Dali::Actor self = Self();
@@@ -255,7 -225,8 +256,7 @@@
    {
      state[Dali::Accessibility::State::MODAL] = true;
    }
 -  state[Dali::Accessibility::State::SHOWING] = !self.GetProperty(Dali::DevelActor::Property::CULLED).Get<bool>() && self.GetCurrentProperty<bool>(Actor::Property::VISIBLE);
 -
 +  state[Dali::Accessibility::State::SHOWING] = IsShowing();
    state[Dali::Accessibility::State::DEFUNCT] = !self.GetProperty(Dali::DevelActor::Property::CONNECTED_TO_SCENE).Get<bool>();
    return state;
  }
@@@ -308,7 -279,16 +309,16 @@@ Dali::Rect<> AccessibleImpl::GetExtents
    Vector3 anchorPointOffSet = size * (positionUsesAnchorPoint ? self.GetCurrentProperty<Vector3>(Actor::Property::ANCHOR_POINT) : AnchorPoint::TOP_LEFT);
    Vector2 position = Vector2((screenPosition.x - anchorPointOffSet.x), (screenPosition.y - anchorPointOffSet.y));
  
-   return {position.x, position.y, size.x, size.y};
+   if(type == Dali::Accessibility::CoordinateType::WINDOW)
+   {
+     return {position.x, position.y, size.x, size.y};
+   }
+   else // Dali::Accessibility::CoordinateType::SCREEN
+   {
+     auto window = Dali::DevelWindow::Get(self);
+     auto windowPosition = window.GetPosition();
+     return {position.x + windowPosition.GetX(), position.y + windowPosition.GetY(), size.x, size.y};
+   }
  }
  
  int16_t AccessibleImpl::GetMdiZOrder()