Change-Id: I9a718cb49886146a169f82bb3cd5acf81d121fa2
Signed-off-by: György Straub <g.straub@partner.samsung.com>
15 files changed:
DALI_TEST_EQUALS( actor.GetProperty< bool >( Actor::Property::CULLED ), false, TEST_LOCATION );
PropertyNotification notification = actor.AddPropertyNotification( Actor::Property::CULLED, LessThanCondition( 0.5f ) );
DALI_TEST_EQUALS( actor.GetProperty< bool >( Actor::Property::CULLED ), false, TEST_LOCATION );
PropertyNotification notification = actor.AddPropertyNotification( Actor::Property::CULLED, LessThanCondition( 0.5f ) );
- notification.SetNotifyMode( PropertyNotification::NotifyOnChanged );
+ notification.SetNotifyMode( PropertyNotification::NOTIFY_ON_CHANGED );
// Connect NotifySignal
bool propertyNotificationSignal( false );
// Connect NotifySignal
bool propertyNotificationSignal( false );
constraint.AddSource( LocalSource( Actor::Property::ORIENTATION ) );
constraint.AddSource( LocalSource( Actor::Property::COLOR ) );
constraint.AddSource( LocalSource( Actor::Property::VISIBLE ) );
constraint.AddSource( LocalSource( Actor::Property::ORIENTATION ) );
constraint.AddSource( LocalSource( Actor::Property::COLOR ) );
constraint.AddSource( LocalSource( Actor::Property::VISIBLE ) );
- constraint.SetRemoveAction( Constraint::Discard );
+ constraint.SetRemoveAction( Constraint::DISCARD );
constraint.SetTag( 123 );
// Clone the constraint & apply the clone
constraint.SetTag( 123 );
// Clone the constraint & apply the clone
Constraint constraint = Constraint::New< Vector3 >( actor, Actor::Property::POSITION, &BasicFunction< Vector3 > );
DALI_TEST_EQUALS( constraint.GetRemoveAction(), Constraint::DEFAULT_REMOVE_ACTION, TEST_LOCATION );
Constraint constraint = Constraint::New< Vector3 >( actor, Actor::Property::POSITION, &BasicFunction< Vector3 > );
DALI_TEST_EQUALS( constraint.GetRemoveAction(), Constraint::DEFAULT_REMOVE_ACTION, TEST_LOCATION );
- constraint.SetRemoveAction( Constraint::Discard );
- DALI_TEST_EQUALS( constraint.GetRemoveAction(), Constraint::Discard, TEST_LOCATION );
+ constraint.SetRemoveAction( Constraint::DISCARD );
+ DALI_TEST_EQUALS( constraint.GetRemoveAction(), Constraint::DISCARD, TEST_LOCATION );
- constraint.SetRemoveAction( Constraint::Bake );
- DALI_TEST_EQUALS( constraint.GetRemoveAction(), Constraint::Bake, TEST_LOCATION );
+ constraint.SetRemoveAction( Constraint::BAKE );
+ DALI_TEST_EQUALS( constraint.GetRemoveAction(), Constraint::BAKE, TEST_LOCATION );
Constraint constraint;
try
{
Constraint constraint;
try
{
- constraint.SetRemoveAction( Constraint::Discard );
+ constraint.SetRemoveAction( Constraint::DISCARD );
DALI_TEST_CHECK( false ); // Should not reach here!
}
catch( ... )
DALI_TEST_CHECK( false ); // Should not reach here!
}
catch( ... )
// Create a constraint that constrains to position
Constraint constraint = Constraint::New< Vector3 >( actor, Actor::Property::POSITION, SetValueFunctor< Vector3 >( position ) );
// Create a constraint that constrains to position
Constraint constraint = Constraint::New< Vector3 >( actor, Actor::Property::POSITION, SetValueFunctor< Vector3 >( position ) );
- constraint.SetRemoveAction( Constraint::Bake );
+ constraint.SetRemoveAction( Constraint::BAKE );
constraint.Apply();
application.SendNotification();
constraint.Apply();
application.SendNotification();
// Create a constraint that constrains to position
Constraint constraint = Constraint::New< Vector3 >( actor, Actor::Property::POSITION, SetValueFunctor< Vector3 >( position ) );
// Create a constraint that constrains to position
Constraint constraint = Constraint::New< Vector3 >( actor, Actor::Property::POSITION, SetValueFunctor< Vector3 >( position ) );
- constraint.SetRemoveAction( Constraint::Discard );
+ constraint.SetRemoveAction( Constraint::DISCARD );
constraint.Apply();
application.SendNotification();
constraint.Apply();
application.SendNotification();
// Create a constraint whose value is discarded when it is removed
Constraint constraint = Constraint::New< Vector4 >( actor, Actor::Property::COLOR, SetHalfOpacity );
// Create a constraint whose value is discarded when it is removed
Constraint constraint = Constraint::New< Vector4 >( actor, Actor::Property::COLOR, SetHalfOpacity );
- constraint.SetRemoveAction( Constraint::RemoveAction::Discard );
+ constraint.SetRemoveAction( Constraint::RemoveAction::DISCARD );
constraint.Apply();
// Check value after one render, it should be constrained
constraint.Apply();
// Check value after one render, it should be constrained
// Create a constraint whose value is discarded when it is removed
Constraint constraint = Constraint::New< Vector4 >( actor, Actor::Property::COLOR, SetHalfOpacity );
// Create a constraint whose value is discarded when it is removed
Constraint constraint = Constraint::New< Vector4 >( actor, Actor::Property::COLOR, SetHalfOpacity );
- constraint.SetRemoveAction( Constraint::RemoveAction::Discard );
+ constraint.SetRemoveAction( Constraint::RemoveAction::DISCARD );
constraint.Apply();
// Check value after one render, it should be constrained
constraint.Apply();
// Check value after one render, it should be constrained
Dali::Constraint instance;
try
{
Dali::Constraint instance;
try
{
- Dali::Constraint::RemoveAction arg1(Constraint::Bake);
+ Dali::Constraint::RemoveAction arg1(Constraint::BAKE);
instance.SetRemoveAction(arg1);
DALI_TEST_CHECK(false); // Should not get here
}
instance.SetRemoveAction(arg1);
DALI_TEST_CHECK(false); // Should not get here
}
PropertyNotification notification = actor.AddPropertyNotification(Actor::Property::POSITION_X,
GreaterThanCondition(100.0f));
PropertyNotification notification = actor.AddPropertyNotification(Actor::Property::POSITION_X,
GreaterThanCondition(100.0f));
- notification.SetNotifyMode(PropertyNotification::NotifyOnChanged);
+ notification.SetNotifyMode(PropertyNotification::NOTIFY_ON_CHANGED);
PropertyNotification::NotifyMode notifyMode = notification.GetNotifyMode();
PropertyNotification::NotifyMode notifyMode = notification.GetNotifyMode();
- DALI_TEST_EQUALS( notifyMode, PropertyNotification::NotifyOnChanged, TEST_LOCATION );
+ DALI_TEST_EQUALS( notifyMode, PropertyNotification::NOTIFY_ON_CHANGED, TEST_LOCATION );
PropertyNotification notification = actor.AddPropertyNotification(Actor::Property::POSITION_X,
GreaterThanCondition(100.0f));
PropertyNotification notification = actor.AddPropertyNotification(Actor::Property::POSITION_X,
GreaterThanCondition(100.0f));
- notification.SetNotifyMode(PropertyNotification::NotifyOnChanged);
+ notification.SetNotifyMode(PropertyNotification::NOTIFY_ON_CHANGED);
gCallBackCalled = false;
notification.NotifySignal().Connect( &TestCallback );
gCallBackCalled = false;
notification.NotifySignal().Connect( &TestCallback );
Actor actor = Actor::New();
PropertyNotification notification = actor.AddPropertyNotification( Actor::Property::SIZE, StepCondition( 1.0f, 1.0f ) );
Actor actor = Actor::New();
PropertyNotification notification = actor.AddPropertyNotification( Actor::Property::SIZE, StepCondition( 1.0f, 1.0f ) );
- notification.SetNotifyMode(PropertyNotification::NotifyOnChanged);
+ notification.SetNotifyMode(PropertyNotification::NOTIFY_ON_CHANGED);
gCallBackCalled = false;
notification.NotifySignal().Connect( &TestCallback );
gCallBackCalled = false;
notification.NotifySignal().Connect( &TestCallback );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 101.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 101.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
}
// Up event, no time diff, no movement
}
// Up event, no time diff, no movement
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 102.0f, 102.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 102.0f, 102.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 103.0f, 103.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 103.0f, 103.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 103.0f, 103.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 103.0f, 103.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchBoth, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_BOTH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 102.0f, 102.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 102.0f, 102.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::UP, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::MOTION, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::MOTION, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchHover, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_HOVER, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.points[0].GetState(), PointState::STARTED, TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 102.0f, 102.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::DOWN, 200.0f, 200.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::DOWN, 200.0f, 200.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[1].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), PointState::STATIONARY, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[1].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), PointState::STATIONARY, TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::MOTION, 101.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::MOTION, 200.0f, 200.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::MOTION, 200.0f, 200.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::MOTION, 201.0f, 201.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::MOTION, 201.0f, 201.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[1].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), PointState::STATIONARY, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[1].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), PointState::STATIONARY, TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 101.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 101.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 2u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::MOTION, 202.0f, 202.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::MOTION, 202.0f, 202.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::UP, 202.0f, 202.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 2, PointState::UP, 202.0f, 202.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( pointCount, PointState::DOWN, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( pointCount, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time++, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time++, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION );
}
DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION );
}
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( pointCount, PointState::UP, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( pointCount, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time++, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time++, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION );
}
END_TEST;
DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION );
}
END_TEST;
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetDeviceId(), point.GetDeviceId(), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::INTERRUPTED, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::INTERRUPTED, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchBoth, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_BOTH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( pointCount, PointState::DOWN, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( pointCount, PointState::DOWN, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchTouch, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_TOUCH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION );
}
DALI_TEST_EQUALS( touchEvent.GetPointCount(), pointCount, TEST_LOCATION );
}
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::INTERRUPTED, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::INTERRUPTED, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchBoth, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_BOTH, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.GetPointCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( touchEvent.points[0].GetState(), point.GetState(), TEST_LOCATION );
DALI_TEST_EQUALS( hoverEvent.GetPointCount(), 1u, TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::UP, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::STATIONARY, 100.0f, 100.0f );
Integration::HoverEvent hoverEvent;
Integration::Point point = GeneratePoint( 1, PointState::STATIONARY, 100.0f, 100.0f );
- DALI_TEST_EQUALS( Integration::TouchEventCombiner::DispatchNone, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
+ DALI_TEST_EQUALS( Integration::TouchEventCombiner::DISPATCH_NONE, combiner.GetNextTouchEvent( point, time, touchEvent, hoverEvent ), TEST_LOCATION );
TouchEventCombiner::EventDispatchType TouchEventCombiner::GetNextTouchEvent( const Point& point, uint32_t time, TouchEvent& touchEvent, HoverEvent& hoverEvent )
{
TouchEventCombiner::EventDispatchType TouchEventCombiner::GetNextTouchEvent( const Point& point, uint32_t time, TouchEvent& touchEvent, HoverEvent& hoverEvent )
{
- TouchEventCombiner::EventDispatchType dispatchEvent( TouchEventCombiner::DispatchNone );
+ TouchEventCombiner::EventDispatchType dispatchEvent( TouchEventCombiner::DISPATCH_NONE );
const PointState::Type state = point.GetState();
const int deviceId = point.GetDeviceId();
const PointState::Type state = point.GetState();
const int deviceId = point.GetDeviceId();
{
mPressedPoints.push_back( PointInfo( point, time ) );
touchEvent.AddPoint( point );
{
mPressedPoints.push_back( PointInfo( point, time ) );
touchEvent.AddPoint( point );
- dispatchEvent = TouchEventCombiner::DispatchTouch; // Only dispatch touch event if just added to container
+ dispatchEvent = TouchEventCombiner::DISPATCH_TOUCH; // Only dispatch touch event if just added to container
// Check whether hover event was dispatched previously
if ( !mHoveredPoints.empty() )
// Check whether hover event was dispatched previously
if ( !mHoveredPoints.empty() )
if ( match != mHoveredPoints.end() )
{
mHoveredPoints.erase( match );
if ( match != mHoveredPoints.end() )
{
mHoveredPoints.erase( match );
- dispatchEvent = TouchEventCombiner::DispatchBoth; // We should only dispatch hover events if the point was actually hovered in this window
+ dispatchEvent = TouchEventCombiner::DISPATCH_BOTH; // We should only dispatch hover events if the point was actually hovered in this window
if ( match != mPressedPoints.end() )
{
mPressedPoints.erase( match );
if ( match != mPressedPoints.end() )
{
mPressedPoints.erase( match );
- dispatchEvent = TouchEventCombiner::DispatchTouch; // We should only dispatch touch events if the point was actually pressed in this window
+ dispatchEvent = TouchEventCombiner::DISPATCH_TOUCH; // We should only dispatch touch events if the point was actually pressed in this window
// Iterate through already stored touch points for HoverEvent and delete them
for ( PointInfoContainer::iterator iter = mHoveredPoints.begin(), endIter = mHoveredPoints.end(); iter != endIter; ++iter )
// Iterate through already stored touch points for HoverEvent and delete them
for ( PointInfoContainer::iterator iter = mHoveredPoints.begin(), endIter = mHoveredPoints.end(); iter != endIter; ++iter )
PointInfo matchedPoint( point, time );
std::swap( *match, matchedPoint );
PointInfo matchedPoint( point, time );
std::swap( *match, matchedPoint );
- dispatchEvent = TouchEventCombiner::DispatchTouch; // Dispatch touch event
+ dispatchEvent = TouchEventCombiner::DISPATCH_TOUCH; // Dispatch touch event
std::swap( *match, matchedPoint );
}
std::swap( *match, matchedPoint );
}
- if(dispatchEvent == TouchEventCombiner::DispatchTouch)
+ if(dispatchEvent == TouchEventCombiner::DISPATCH_TOUCH)
- dispatchEvent = TouchEventCombiner::DispatchBoth;
+ dispatchEvent = TouchEventCombiner::DISPATCH_BOTH;
- dispatchEvent = TouchEventCombiner::DispatchHover;
+ dispatchEvent = TouchEventCombiner::DISPATCH_HOVER;
// We should still tell core about the interruption.
touchEvent.AddPoint( point );
hoverEvent.AddPoint( point );
// We should still tell core about the interruption.
touchEvent.AddPoint( point );
hoverEvent.AddPoint( point );
- dispatchEvent = TouchEventCombiner::DispatchBoth;
+ dispatchEvent = TouchEventCombiner::DISPATCH_BOTH;
- DispatchTouch, ///< The touch event should be dispatched.
- DispatchHover, ///< The hover event should be dispatched.
- DispatchBoth, ///< Both touch event and hover event should be dispatched.
- DispatchNone ///< Neither touch event nor hover event should be dispatched.
+ DISPATCH_TOUCH, ///< The touch event should be dispatched.
+ DISPATCH_HOVER, ///< The hover event should be dispatched.
+ DISPATCH_BOTH, ///< Both touch event and hover event should be dispatched.
+ DISPATCH_NONE ///< Neither touch event nor hover event should be dispatched.
constraint.AddSource( Dali::Source(source.object, source.propertyIndex ) );
constraint.SetTag( static_cast<uint32_t>( reinterpret_cast<uintptr_t>( this ) ) ); // taking 32bits of this as tag
constraint.AddSource( Dali::Source(source.object, source.propertyIndex ) );
constraint.SetTag( static_cast<uint32_t>( reinterpret_cast<uintptr_t>( this ) ) ); // taking 32bits of this as tag
- constraint.SetRemoveAction( Dali::Constraint::Discard );
+ constraint.SetRemoveAction( Dali::Constraint::DISCARD );
constraint.Apply();
//Start observing the object
constraint.Apply();
//Start observing the object
constraint.AddSource( Dali::Source(source.object, source.propertyIndex ) );
constraint.SetTag( static_cast<uint32_t>( reinterpret_cast<uintptr_t>( this ) ) ); // taking 32bits of this as tag
constraint.AddSource( Dali::Source(source.object, source.propertyIndex ) );
constraint.SetTag( static_cast<uint32_t>( reinterpret_cast<uintptr_t>( this ) ) ); // taking 32bits of this as tag
- constraint.SetRemoveAction( Dali::Constraint::Discard );
+ constraint.SetRemoveAction( Dali::Constraint::DISCARD );
constraint.Apply();
}
else if( propertyType == Dali::Property::ROTATION )
constraint.Apply();
}
else if( propertyType == Dali::Property::ROTATION )
constraint.AddSource( Dali::Source(source.object, source.propertyIndex ) );
constraint.SetTag( static_cast<uint32_t>( reinterpret_cast<uintptr_t>( this ) ) ); // taking 32bits of this as tag
constraint.AddSource( Dali::Source(source.object, source.propertyIndex ) );
constraint.SetTag( static_cast<uint32_t>( reinterpret_cast<uintptr_t>( this ) ) ); // taking 32bits of this as tag
- constraint.SetRemoveAction( Dali::Constraint::Discard );
+ constraint.SetRemoveAction( Dali::Constraint::DISCARD );
mPropertyType( Property::NONE ),
mComponentIndex( componentIndex ),
mCondition( condition ),
mPropertyType( Property::NONE ),
mComponentIndex( componentIndex ),
mCondition( condition ),
- mNotifyMode( Dali::PropertyNotification::NotifyOnTrue ),
+ mNotifyMode( Dali::PropertyNotification::NOTIFY_ON_TRUE ),
mNotifyResult( false ),
mCompare( false )
{
mNotifyResult( false ),
mCompare( false )
{
// found one with the matching SceneGraph::PropertyNotification?
if( (*iter)->CompareSceneObject( propertyNotification ) )
{
// found one with the matching SceneGraph::PropertyNotification?
if( (*iter)->CompareSceneObject( propertyNotification ) )
{
- // allow application to access the value that triggered this emit incase of NotifyOnChanged mode
+ // allow application to access the value that triggered this emit incase of NOTIFY_ON_CHANGED mode
(*iter)->SetNotifyResult(validity);
// yes..emit signal
(*iter)->EmitSignalNotify();
(*iter)->SetNotifyResult(validity);
// yes..emit signal
(*iter)->EmitSignalNotify();
mFunc->Apply( updateBufferIndex, current );
// Optionally bake the final value
mFunc->Apply( updateBufferIndex, current );
// Optionally bake the final value
- if ( Dali::Constraint::Bake == mRemoveAction )
+ if ( Dali::Constraint::BAKE == mRemoveAction )
{
mTargetProperty.Bake( updateBufferIndex, current );
}
{
mTargetProperty.Bake( updateBufferIndex, current );
}
mConditionType(condition),
mArguments(arguments),
mValid(false),
mConditionType(condition),
mArguments(arguments),
mValid(false),
- mNotifyMode( Dali::PropertyNotification::Disabled ),
+ mNotifyMode( Dali::PropertyNotification::DISABLED ),
mConditionFunction(NULL)
{
SetNotifyMode(notifyMode);
mConditionFunction(NULL)
{
SetNotifyMode(notifyMode);
// means don't notify so notifyRequired stays false
switch( mNotifyMode )
{
// means don't notify so notifyRequired stays false
switch( mNotifyMode )
{
- case Dali::PropertyNotification::Disabled:
+ case Dali::PropertyNotification::DISABLED:
{
// notify never, already initialized to false
break;
}
{
// notify never, already initialized to false
break;
}
- case Dali::PropertyNotification::NotifyOnTrue:
+ case Dali::PropertyNotification::NOTIFY_ON_TRUE:
{
notifyRequired = mValid; // notify if value is true
break;
}
{
notifyRequired = mValid; // notify if value is true
break;
}
- case Dali::PropertyNotification::NotifyOnFalse:
+ case Dali::PropertyNotification::NOTIFY_ON_FALSE:
{
notifyRequired = !mValid; // notify when its false
break;
}
{
notifyRequired = !mValid; // notify when its false
break;
}
- case Dali::PropertyNotification::NotifyOnChanged:
+ case Dali::PropertyNotification::NOTIFY_ON_CHANGED:
{
notifyRequired = true; // notify whenever changed
break;
{
notifyRequired = true; // notify whenever changed
break;
-const Constraint::RemoveAction Constraint::DEFAULT_REMOVE_ACTION = Constraint::Bake;
+const Constraint::RemoveAction Constraint::DEFAULT_REMOVE_ACTION = Constraint::BAKE;
Constraint::Constraint()
{
Constraint::Constraint()
{
- Bake, ///< When the constraint is fully-applied, the constrained value is saved. @SINCE_1_0.0
- Discard ///< When the constraint is removed, the constrained value is discarded. @SINCE_1_0.0
+ BAKE, ///< When the constraint is fully-applied, the constrained value is saved. @SINCE_1_9.28
+ DISCARD ///< When the constraint is removed, the constrained value is discarded. @SINCE_1_9.28
- static const RemoveAction DEFAULT_REMOVE_ACTION; ///< Bake
+ static const RemoveAction DEFAULT_REMOVE_ACTION; ///< BAKE
/**
* @brief Creates an uninitialized Constraint; this can be initialized with Constraint::New().
/**
* @brief Creates an uninitialized Constraint; this can be initialized with Constraint::New().
Dali::Property::Index GetTargetProperty();
/**
Dali::Property::Index GetTargetProperty();
/**
- * @brief Sets the remove action. Constraint::Bake will "bake" a value when fully-applied.
+ * @brief Sets the remove action. Constraint::BAKE will "bake" a value when fully-applied.
- * In case of Constraint::Discard, the constrained value will be discarded, when the constraint is removed.
- * The default value is Constraint::Bake.
+ * In case of Constraint::DISCARD, the constrained value will be discarded, when the constraint is removed.
+ * The default value is Constraint::BAKE.
* @SINCE_1_0.0
* @param[in] action The remove-action
*/
* @SINCE_1_0.0
* @param[in] action The remove-action
*/
- Disabled, ///< Don't notify, regardless of result of Condition @SINCE_1_0.0
- NotifyOnTrue, ///< Notify whenever condition changes from false to true. @SINCE_1_0.0
- NotifyOnFalse, ///< Notify whenever condition changes from true to false. @SINCE_1_0.0
- NotifyOnChanged ///< Notify whenever condition changes (false to true, and true to false) @SINCE_1_0.0
+ DISABLED, ///< Don't notify, regardless of result of Condition @SINCE_1_9.28
+ NOTIFY_ON_TRUE, ///< Notify whenever condition changes from false to true. @SINCE_1_9.28
+ NOTIFY_ON_FALSE, ///< Notify whenever condition changes from true to false. @SINCE_1_9.28
+ NOTIFY_ON_CHANGED ///< Notify whenever condition changes (false to true, and true to false) @SINCE_1_9.28
* notification should respond to the result of a condition.
*
* @SINCE_1_0.0
* notification should respond to the result of a condition.
*
* @SINCE_1_0.0
- * @param[in] mode Notification mode (Default is PropertyNotification::NotifyOnTrue)
+ * @param[in] mode Notification mode (Default is PropertyNotification::NOTIFY_ON_TRUE)
*/
void SetNotifyMode( NotifyMode mode );
*/
void SetNotifyMode( NotifyMode mode );
/**
* @brief Gets the result of the last condition check that caused a signal emit,
/**
* @brief Gets the result of the last condition check that caused a signal emit,
- * useful when using NotifyOnChanged mode and need to know what it changed to.
+ * useful when using NOTIFY_ON_CHANGED mode and need to know what it changed to.
*
* @SINCE_1_0.0
* @return whether condition result that triggered last emit was true or false
*
* @SINCE_1_0.0
* @return whether condition result that triggered last emit was true or false