/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
test_return_value = TET_PASS;
}
-
namespace
{
+/// Compare an int (Or'd Alignment::Type) with an Alignment::Type value
+void DALI_TEST_EQUALS( int value1, Alignment::Type value2, const char* location )
+{
+ ::DALI_TEST_EQUALS< Alignment::Type >( static_cast< Alignment::Type >( value1 ), value2, location );
+}
+
static bool gObjectCreatedCallBackCalled;
static void TestCallback(BaseHandle handle)
// Default, HorizontalCenter, VerticalCenter - Ensure they do not change!
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// HorizontalLeft, VerticalCenter
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// HorizontalRight, VerticalCenter
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// HorizontalLeft, VerticalTop
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// HorizontalCenter, VerticalTop
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// HorizontalRight, VerticalTop
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// HorizontalLeft, VerticalBottom
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// HorizontalCenter, VerticalBottom
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// HorizontalRight, VerticalBottom
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
{
Alignment alignment = Alignment::New();
DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
{
Alignment alignment = Alignment::New(Alignment::HorizontalLeft);
DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
{
Alignment alignment = Alignment::New(Alignment::HorizontalRight);
DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
{
Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalTop);
DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
{
Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalTop);
DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
{
Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalTop);
DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
{
Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalBottom);
DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
{
Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalBottom);
DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
{
Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalBottom);
DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// ScaleToFill
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// ScaleToFitKeepAspect
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// ScaleToFillKeepAspect
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// ShrinkToFit
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
// ShrinkToFitKeepAspect
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
+ alignment.Add(Actor::New());
Stage::GetCurrent().Add(alignment);
application.Render();
application.SendNotification();
application.Render();
application.SendNotification();
- Actor actor = RenderableActor::New();
+ Actor actor = Actor::New();
alignment.Add(actor);
DALI_TEST_EQUALS(alignment.GetChildCount(), 1u, TEST_LOCATION);
END_TEST;
}
-int UtcDaliAlignmentOnSizeSet(void)
+int UtcDaliAlignmentSizeSetP(void)
{
ToolkitTestApplication application;
application.Render();
application.SendNotification();
- DALI_TEST_EQUALS(size, alignment.GetImplementation().GetControlSize().GetVectorXY(), TEST_LOCATION);
+ DALI_TEST_EQUALS(size, alignment.GetTargetSize().GetVectorXY(), TEST_LOCATION);
Stage::GetCurrent().Remove(alignment);
END_TEST;
}
///////////////////////////////////////////////////////////////////////////////
-static bool TouchEventCallback(Actor actor, const TouchEvent& event)
+static bool TouchCallback(Actor actor, const TouchData& event)
{
return false;
}
alignment.SetAnchorPoint(AnchorPoint::TOP_LEFT);
Stage::GetCurrent().Add(alignment);
- alignment.TouchedSignal().Connect(&TouchEventCallback);
+ alignment.TouchSignal().Connect(&TouchCallback);
application.Render();
application.SendNotification();
application.SendNotification();
Integration::TouchEvent touchEvent(1);
- TouchPoint point(1, TouchPoint::Down, 20.0f, 20.0f);
+ Integration::Point point;
+ point.SetDeviceId( 1 );
+ point.SetState( PointState::DOWN);
+ point.SetScreenPosition( Vector2( 20.0f, 20.0f ) );
touchEvent.AddPoint(point);
application.ProcessEvent(touchEvent);