bool Callback( AccessibilityManager& accessibilityManager, const Dali::TouchEvent& touchEvent )
{
mCalls++;
- mTouchEvent = touchEvent;
+ Dali::TouchEvent handle(touchEvent); // Ensure it's ref-counted
+ mTouchEvent = handle;
tet_infoline( "Signal called" );
return true;
}
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::TouchEvent mTouchEvent ; ///< Stores the last touch event received.
};
int UtcDaliAccessibilityManagerActionScrollSignalP(void)
Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
- TouchPoint point( 0, TouchPoint::Started, 100.0f, 200.0f );
+ TouchPoint point( 0, PointState::STARTED, 100.0f, 200.0f );
accessibilityAdaptor.HandleActionScrollEvent( point, 0u );
DALI_TEST_EQUALS( callback.GetCalls(), 1u, TEST_LOCATION );
const TouchEvent& signalTouchEvent = callback.GetTouchEvent();
DALI_TEST_EQUALS( signalTouchEvent.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( signalTouchEvent.GetState(0), PointState::STARTED, TEST_LOCATION );
+ DALI_TEST_EQUALS( signalTouchEvent.GetScreenPosition(0).x, 100.0f, TEST_LOCATION );
+ DALI_TEST_EQUALS( signalTouchEvent.GetScreenPosition(0).y, 200.0f, TEST_LOCATION );
END_TEST;
}
END_TEST;
}
-int UtcDaliAccessibilityManagerActionTouch(void)
-{
- ToolkitTestApplication application;
- tet_infoline( " UtcDaliAccessibilityManagerActionTouch" );
-
- AccessibilityManager manager = AccessibilityManager::Get();
- DALI_TEST_CHECK( manager );
-
- Dali::AccessibilityAdaptor accessibilityAdaptor = Dali::AccessibilityAdaptor::Get();
-
- DummyControl dummyControl = DummyControl::New(true);
- Impl::DummyControl& dummyImpl = static_cast<Impl::DummyControl&>(dummyControl.GetImplementation());
- dummyControl.SetProperty( Actor::Property::SIZE, Vector2(480, 800) );
- manager.SetFocusOrder( dummyControl, 1 );
- application.GetScene().Add( dummyControl );
- manager.SetCurrentFocusActor( dummyControl );
-
- TouchPoint point( 0, TouchPoint::Started, 100.0f, 200.0f );
- accessibilityAdaptor.HandleActionTouchEvent( point, 0u );
-
- DALI_TEST_CHECK( dummyImpl.onAccTouchedCalled );
-
- END_TEST;
-}
-
-
int UtcDaliAccessibilityManagerHandlePanGesture(void)
{
// Pan gesture sent from adaptor to manager via AccessibilityGestureHandler