{
functorCalled = false;
- receivedTouchEvent.Reset();
+ receivedTouchData.Reset();
}
bool functorCalled;
- TouchEvent receivedTouchEvent;
+ TouchData receivedTouchData;
};
// Functor that sets the data when touched signal is received
{
TouchFunctor( TouchSignalData& data ) : signalData( data ) { }
- void operator()( const TouchEvent& touch )
+ void operator()( const TouchData& touch )
{
signalData.functorCalled = true;
- TouchEvent handle(touch);
- signalData.receivedTouchEvent = handle;
+ TouchData handle(touch);
+ signalData.receivedTouchData = handle;
}
void operator()()
WheelEventSignalData& signalData;
};
-bool DummyTouchCallback( Actor actor, const TouchEvent& touch )
+bool DummyTouchCallback( Actor actor, const TouchData& touch )
{
return true;
}
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
data.Reset();
GenerateTouch( application, PointState::UP, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
data.Reset();
}
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) );
data.Reset();
GenerateTouch( application, PointState::MOTION, Vector2( 150.0f, 10.0f ) ); // Some motion
GenerateTouch( application, PointState::UP, Vector2( 150.0f, 10.0f ) ); // Some motion
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
data.Reset();
}
touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
data.Reset();
// 2nd point
touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION );
+ DALI_TEST_EQUALS( (bool)data.receivedTouchData, false, TEST_LOCATION );
data.Reset();
// Primary point is up
touchEvent.points[1].SetState( PointState::STATIONARY );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION );
+ DALI_TEST_EQUALS( (bool)data.receivedTouchData, false, TEST_LOCATION );
data.Reset();
// Remove 1st point now, 2nd point is now in motion
touchEvent.points[0].SetScreenPosition( Vector2( 150.0f, 50.0f ) );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION );
+ DALI_TEST_EQUALS( (bool)data.receivedTouchData, false, TEST_LOCATION );
data.Reset();
// Final point Up
touchEvent.points[0].SetState( PointState::UP );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
data.Reset();
}
END_TEST;
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
data.Reset();
// Confirm there is no signal when the touchpoint is only moved.
GenerateTouch( application, PointState::UP, Vector2( 1200.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
data.Reset();
}
GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED );
data.Reset();
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::DOWN );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor );
+ DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::DOWN );
data.Reset();
GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED );
- DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
// Check that getting info about a non-existent point causes an assert.
- DALI_TEST_EQUALS( data.receivedTouchEvent.GetState( 1 ), PointState::FINISHED, TEST_LOCATION );
+ DALI_TEST_EQUALS( data.receivedTouchData.GetState( 1 ), PointState::FINISHED, TEST_LOCATION );
data.Reset();
}
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
data.Reset();
GenerateTouch( application, PointState::UP, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
data.Reset();
}
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor );
data.Reset();
GenerateTouch( application, PointState::MOTION, Vector2( 150.0f, 10.0f ) ); // Some motion
GenerateTouch( application, PointState::UP, Vector2( 150.0f, 10.0f ) ); // Some motion
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
data.Reset();
}
touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
data.Reset();
// 2nd point
touchEvent.points[0].SetState( PointState::UP );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
data.Reset();
}
END_TEST;
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0));
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0));
DALI_TEST_EQUALS( true, data2.functorCalled, TEST_LOCATION );
GenerateTouch( application, PointState::UP, Vector2( 1200.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0));
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0));
data.Reset();
}
GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED );
data.Reset();
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::DOWN );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor );
+ DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::DOWN );
data.Reset();
GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
- DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
+ DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED );
- DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
// Check that getting info about a non-existent point returns an empty handle
- Actor actor = data.receivedTouchEvent.GetHitActor( 1 );
+ Actor actor = data.receivedTouchData.GetHitActor( 1 );
DALI_TEST_CHECK( !actor );
data.Reset();