DALI_TEST_CHECK(manager.GetActorByFocusOrder(3) == Actor());
// Add the actors to the stage
- Stage::GetCurrent().Add(first);
- Stage::GetCurrent().Add(second);
- Stage::GetCurrent().Add(third);
+ application.GetScene().Add(first);
+ application.GetScene().Add(second);
+ application.GetScene().Add(third);
// Check that we get an empty handle because focus order 0 means undefined.
DALI_TEST_CHECK(manager.GetActorByFocusOrder(0) == Actor());
// Create the first actor and add it to the stage
Actor first = Actor::New();
manager.SetFocusOrder(first, 1);
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
// Create the second actor and add it to the stage
Actor second = Actor::New();
manager.SetFocusOrder(second, 2);
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
// Create the third actor but don't add it to the stage
Actor third = Actor::New();
DALI_TEST_CHECK(manager.SetCurrentFocusActor(third) == false);
// Add the third actor to the stage
- Stage::GetCurrent().Add(third);
+ application.GetScene().Add(third);
// make the third actor invisible
third.SetProperty( Actor::Property::VISIBLE,false);
Actor secondChild = Actor::New();
parent.Add(firstChild);
parent.Add(secondChild);
- Stage::GetCurrent().Add(parent);
+ application.GetScene().Add(parent);
// Create three actors and add them as the children of the first child actor
Actor firstGrandChild = Actor::New();
accAdaptor.HandleActionEnableEvent();
Actor first = Actor::New();
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
Actor second = Actor::New();
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
Actor third = Actor::New();
- Stage::GetCurrent().Add(third);
+ application.GetScene().Add(third);
// Set the focus order and description for the first actor
manager.SetFocusOrder(first, 1);
accAdaptor.HandleActionNextEvent(true);
Actor first = Actor::New();
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
Actor second = Actor::New();
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
Actor third = Actor::New();
- Stage::GetCurrent().Add(third);
+ application.GetScene().Add(third);
// Set the focus order and description for the first actor
manager.SetFocusOrder(first, 1);
accAdaptor.HandleActionEnableEvent();
Actor first = Actor::New();
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
Actor second = Actor::New();
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
Actor third = Actor::New();
- Stage::GetCurrent().Add(third);
+ application.GetScene().Add(third);
// Set the focus order and description for the first actor
manager.SetFocusOrder(first, 1);
// Create the first actor and add it to the stage
Actor first = Actor::New();
manager.SetFocusOrder(first, 1);
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
// Create the second actor and add it to the stage
Actor second = Actor::New();
manager.SetFocusOrder(second, 2);
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
// Check that no actor is being focused yet.
DALI_TEST_CHECK(manager.GetCurrentFocusActor() == Actor());
// Create the first actor and add it to the stage
Actor first = Actor::New();
manager.SetFocusOrder(first, 1);
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
// Create the second actor and add it to the stage
Actor second = Actor::New();
manager.SetFocusOrder(second, 2);
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
// Check that no actor is being focused yet.
DALI_TEST_CHECK(manager.GetCurrentFocusActor() == Actor());
Actor secondChild = Actor::New();
parent.Add(firstChild);
parent.Add(secondChild);
- Stage::GetCurrent().Add(parent);
+ application.GetScene().Add(parent);
// Create three actors and add them as the children of the first child actor
Actor firstGrandChild = Actor::New();
DALI_TEST_CHECK(defaultFocusIndicatorActor);
Actor focusedActor = Actor::New();
- Stage::GetCurrent().Add( focusedActor );
+ application.GetScene().Add( focusedActor );
application.SendNotification();
application.Render();
// Create the first actor and add it to the stage
Actor first = Actor::New();
manager.SetFocusOrder(first, 1);
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
// Create the second actor and add it to the stage
Actor second = Actor::New();
manager.SetFocusOrder(second, 2);
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
// Check that no actor is being focused yet.
DALI_TEST_CHECK(manager.GetCurrentFocusActor() == Actor());
// Create the first actor and add it to the stage
Actor first = Actor::New();
manager.SetFocusOrder(first, 1);
- Stage::GetCurrent().Add(first);
+ application.GetScene().Add(first);
// Create the second actor and add it to the stage
Actor second = Actor::New();
manager.SetFocusOrder(second, 2);
- Stage::GetCurrent().Add(second);
+ application.GetScene().Add(second);
// Check that the wrap mode is disabled
DALI_TEST_CHECK(manager.GetWrapMode() == false);
Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New();
button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
- Stage::GetCurrent().Add(button);
+ application.GetScene().Add(button);
manager.SetFocusOrder( button, 1 );
manager.SetCurrentFocusActor( button );
DummyControl dummyControl = DummyControl::New(true);
dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
manager.SetFocusOrder( dummyControl, 1 );
- Stage::GetCurrent().Add( dummyControl );
+ application.GetScene().Add( dummyControl );
manager.SetCurrentFocusActor( dummyControl );
accessibilityAdaptor.HandleActionUpEvent();
Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New();
button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
- Stage::GetCurrent().Add(button);
+ application.GetScene().Add(button);
manager.SetFocusOrder( button, 1 );
manager.SetCurrentFocusActor( button );
Dali::Toolkit::PushButton button = Dali::Toolkit::PushButton::New();
button.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
- Stage::GetCurrent().Add(button);
+ application.GetScene().Add(button);
manager.SetFocusOrder( button, 1 );
manager.SetCurrentFocusActor( button );
{
}
- bool Callback( AccessibilityManager& accessibilityManager, const Dali::TouchEvent& touchEvent )
+ bool Callback( AccessibilityManager& accessibilityManager, const Dali::TouchData& touchEvent )
{
mCalls++;
- mTouchEvent = touchEvent;
+ Dali::TouchData handle(touchEvent); // Ensure it's ref-counted
+ mTouchData = handle;
tet_infoline( "Signal called" );
return true;
}
return mCalls;
}
- const Dali::TouchEvent& GetTouchEvent() const
+ const Dali::TouchData& GetTouchData() const
{
- return mTouchEvent;
+ return mTouchData;
}
private:
unsigned int mCalls; ///< Keeps track of how many times the signal has been called.
- Dali::TouchEvent mTouchEvent; ///< Stores the last touch event received.
+ Dali::TouchData mTouchData ; ///< Stores the last touch event received.
};
int UtcDaliAccessibilityManagerActionScrollSignalP(void)
DALI_TEST_EQUALS( callback.GetCalls(), 1u, TEST_LOCATION );
- const TouchEvent& signalTouchEvent = callback.GetTouchEvent();
- DALI_TEST_EQUALS( signalTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
+ const TouchData& signalTouchData = callback.GetTouchData();
+ DALI_TEST_EQUALS( signalTouchData.GetPointCount(), 1u, TEST_LOCATION );
- const TouchPoint& signalTouchPoint = signalTouchEvent.GetPoint( 0u );
- DALI_TEST_EQUALS( signalTouchPoint.state, TouchPoint::Started, TEST_LOCATION );
- DALI_TEST_EQUALS( signalTouchPoint.screen.x, 100.0f, TEST_LOCATION );
- DALI_TEST_EQUALS( signalTouchPoint.screen.y, 200.0f, TEST_LOCATION );
+ DALI_TEST_EQUALS( signalTouchData.GetState(0), PointState::STARTED, TEST_LOCATION );
+ DALI_TEST_EQUALS( signalTouchData.GetScreenPosition(0).x, 100.0f, TEST_LOCATION );
+ DALI_TEST_EQUALS( signalTouchData.GetScreenPosition(0).y, 200.0f, TEST_LOCATION );
END_TEST;
}
Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
manager.SetFocusOrder( dummyControl, 1 );
- Stage::GetCurrent().Add( dummyControl );
+ application.GetScene().Add( dummyControl );
manager.SetCurrentFocusActor( dummyControl );
TouchPoint point( 0, TouchPoint::Started, 100.0f, 200.0f );
Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
DummyControl dummyControl = DummyControl::New(true);
dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
- Stage::GetCurrent().Add( dummyControl );
+ application.GetScene().Add( dummyControl );
AccessibilityGestureEvent panGestureEvent(AccessibilityGestureEvent::Started);
panGestureEvent.previousPosition = Vector2(0.f, 0.f);