/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
#include <dali-toolkit-test-suite-utils.h>
#include <dali/integration-api/events/key-event-integ.h>
#include <dali/integration-api/events/touch-event-integ.h>
+#include <dali-toolkit/devel-api/controls/alignment/alignment.h>
#include <dali-toolkit/dali-toolkit.h>
using namespace Dali;
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)
{
ToolkitTestApplication application;
- //Te ensure the object is registered after creation
- ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
+ //To ensure the object is registered after creation
+ ObjectRegistry registry = application.GetCore().GetObjectRegistry();
DALI_TEST_CHECK( registry );
gObjectCreatedCallBackCalled = false;
{
ToolkitTestApplication application;
- // Default, HorizontalCenter, VerticalCenter - Ensure they do not change!
+ // Default, HORIZONTAL_CENTER, VERTICAL_CENTER - Ensure they do not change!
{
Alignment alignment = Alignment::New();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::VerticalCenter));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER));
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
}
- // HorizontalLeft, VerticalCenter
+ // HORIZONTAL_LEFT, VERTICAL_CENTER
{
Alignment alignment = Alignment::New();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::HorizontalLeft);
+ Alignment::Type type(Alignment::HORIZONTAL_LEFT);
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
}
- // HorizontalRight, VerticalCenter
+ // HORIZONTAL_RIGHT, VERTICAL_CENTER
{
Alignment alignment = Alignment::New();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::HorizontalRight);
+ Alignment::Type type(Alignment::HORIZONTAL_RIGHT);
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
}
- // HorizontalLeft, VerticalTop
+ // HORIZONTAL_LEFT, VERTICAL_TOP
{
Alignment alignment = Alignment::New();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalTop));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP));
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
}
- // HorizontalCenter, VerticalTop
+ // HORIZONTAL_CENTER, VERTICAL_TOP
{
Alignment alignment = Alignment::New();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::VerticalTop);
+ Alignment::Type type(Alignment::VERTICAL_TOP);
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
}
- // HorizontalRight, VerticalTop
+ // HORIZONTAL_RIGHT, VERTICAL_TOP
{
Alignment alignment = Alignment::New();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalTop));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP));
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
}
- // HorizontalLeft, VerticalBottom
+ // HORIZONTAL_LEFT, VERTICAL_BOTTOM
{
Alignment alignment = Alignment::New();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalBottom));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM));
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
}
- // HorizontalCenter, VerticalBottom
+ // HORIZONTAL_CENTER, VERTICAL_BOTTOM
{
Alignment alignment = Alignment::New();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::VerticalBottom);
+ Alignment::Type type(Alignment::VERTICAL_BOTTOM);
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
}
- // HorizontalRight, VerticalBottom
+ // HORIZONTAL_RIGHT, VERTICAL_BOTTOM
{
Alignment alignment = Alignment::New();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalBottom));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM));
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
}
{
ToolkitTestApplication application;
- // Default, HorizontalCenter, VerticalCenter - Ensure they do not change!
+ // Default, HORIZONTAL_CENTER, VERTICAL_CENTER - Ensure they do not change!
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::VerticalCenter));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER));
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalLeft, VerticalCenter
+ // HORIZONTAL_LEFT, VERTICAL_CENTER
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::HorizontalLeft);
+ Alignment::Type type(Alignment::HORIZONTAL_LEFT);
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalRight, VerticalCenter
+ // HORIZONTAL_RIGHT, VERTICAL_CENTER
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::HorizontalRight);
+ Alignment::Type type(Alignment::HORIZONTAL_RIGHT);
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalLeft, VerticalTop
+ // HORIZONTAL_LEFT, VERTICAL_TOP
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalTop));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP));
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalCenter, VerticalTop
+ // HORIZONTAL_CENTER, VERTICAL_TOP
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::VerticalTop);
+ Alignment::Type type(Alignment::VERTICAL_TOP);
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalRight, VerticalTop
+ // HORIZONTAL_RIGHT, VERTICAL_TOP
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalTop));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP));
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalLeft, VerticalBottom
+ // HORIZONTAL_LEFT, VERTICAL_BOTTOM
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalBottom));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM));
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalCenter, VerticalBottom
+ // HORIZONTAL_CENTER, VERTICAL_BOTTOM
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::VerticalBottom);
+ Alignment::Type type(Alignment::VERTICAL_BOTTOM);
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalRight, VerticalBottom
+ // HORIZONTAL_RIGHT, VERTICAL_BOTTOM
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
// Check default values
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
- Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalBottom));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM));
alignment.SetAlignmentType(type);
DALI_TEST_CHECK(alignment.GetAlignmentType() & type);
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
{
ToolkitTestApplication application;
- // Setting HorizontalLeft, HorizontalCenter
+ // Setting HORIZONTAL_LEFT, HORIZONTAL_CENTER
{
Alignment alignment = Alignment::New();
- Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::HorizontalCenter));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::HORIZONTAL_CENTER));
alignment.SetAlignmentType(type);
// center will prevail in conflict
- DALI_TEST_CHECK( Alignment::HorizontalCenter & alignment.GetAlignmentType() );
- DALI_TEST_CHECK( !(Alignment::HorizontalLeft & alignment.GetAlignmentType()) );
+ DALI_TEST_CHECK( Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType() );
+ DALI_TEST_CHECK( !(Alignment::HORIZONTAL_LEFT & alignment.GetAlignmentType()) );
}
- // Setting HorizontalCenter, HorizontalRight
+ // Setting HORIZONTAL_CENTER, HORIZONTAL_RIGHT
{
Alignment alignment = Alignment::New();
- Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::HorizontalRight));
+ Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::HORIZONTAL_RIGHT));
alignment.SetAlignmentType(type);
// center will prevail in conflict
- DALI_TEST_CHECK( Alignment::HorizontalCenter & alignment.GetAlignmentType() );
- DALI_TEST_CHECK( !(Alignment::HorizontalRight & alignment.GetAlignmentType()) );
+ DALI_TEST_CHECK( Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType() );
+ DALI_TEST_CHECK( !(Alignment::HORIZONTAL_RIGHT & alignment.GetAlignmentType()) );
}
- // Setting VerticalTop, VerticalCenter
+ // Setting VERTICAL_TOP, VERTICAL_CENTER
{
Alignment alignment = Alignment::New();
- Alignment::Type type(Alignment::Type(Alignment::VerticalTop | Alignment::VerticalCenter));
+ Alignment::Type type(Alignment::Type(Alignment::VERTICAL_TOP | Alignment::VERTICAL_CENTER));
alignment.SetAlignmentType(type);
// center will prevail in conflict
- DALI_TEST_CHECK( Alignment::VerticalCenter & alignment.GetAlignmentType() );
- DALI_TEST_CHECK( !(Alignment::VerticalTop & alignment.GetAlignmentType()) );
+ DALI_TEST_CHECK( Alignment::VERTICAL_CENTER & alignment.GetAlignmentType() );
+ DALI_TEST_CHECK( !(Alignment::VERTICAL_TOP & alignment.GetAlignmentType()) );
}
- // Setting VerticalCenter, VerticalBottom
+ // Setting VERTICAL_CENTER, VERTICAL_BOTTOM
{
Alignment alignment = Alignment::New();
- Alignment::Type type(Alignment::Type(Alignment::VerticalTop | Alignment::VerticalBottom));
+ Alignment::Type type(Alignment::Type(Alignment::VERTICAL_TOP | Alignment::VERTICAL_BOTTOM));
alignment.SetAlignmentType(type);
// top will prevail in conflict
- DALI_TEST_CHECK( Alignment::VerticalTop & alignment.GetAlignmentType() );
- DALI_TEST_CHECK( !(Alignment::VerticalBottom & alignment.GetAlignmentType()) );
+ DALI_TEST_CHECK( Alignment::VERTICAL_TOP & alignment.GetAlignmentType() );
+ DALI_TEST_CHECK( !(Alignment::VERTICAL_BOTTOM & alignment.GetAlignmentType()) );
}
END_TEST;
}
{
ToolkitTestApplication application;
- // Default, HorizonalCenter, VerticalCenter
+ // Default, HorizonalCenter, VERTICAL_CENTER
{
Alignment alignment = Alignment::New();
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalLeft, VerticalCenter
+ // HORIZONTAL_LEFT, VERTICAL_CENTER
{
- Alignment alignment = Alignment::New(Alignment::HorizontalLeft);
- DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalRight, VerticalCenter
+ // HORIZONTAL_RIGHT, VERTICAL_CENTER
{
- Alignment alignment = Alignment::New(Alignment::HorizontalRight);
- DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalLeft, VerticalTop
+ // HORIZONTAL_LEFT, VERTICAL_TOP
{
- Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalTop);
- DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT, Alignment::VERTICAL_TOP);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalCenter, VerticalTop
+ // HORIZONTAL_CENTER, VERTICAL_TOP
{
- Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalTop);
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ Alignment alignment = Alignment::New(Alignment::HORIZONTAL_CENTER, Alignment::VERTICAL_TOP);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalRight, VerticalTop
+ // HORIZONTAL_RIGHT, VERTICAL_TOP
{
- Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalTop);
- DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT, Alignment::VERTICAL_TOP);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalLeft, VerticalBottom
+ // HORIZONTAL_LEFT, VERTICAL_BOTTOM
{
- Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalBottom);
- DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT, Alignment::VERTICAL_BOTTOM);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalCenter, VerticalBottom
+ // HORIZONTAL_CENTER, VERTICAL_BOTTOM
{
- Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalBottom);
- DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ Alignment alignment = Alignment::New(Alignment::HORIZONTAL_CENTER, Alignment::VERTICAL_BOTTOM);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // HorizontalRight, VerticalBottom
+ // HORIZONTAL_RIGHT, VERTICAL_BOTTOM
{
- Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalBottom);
- DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION);
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT, Alignment::VERTICAL_BOTTOM);
+ DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
{
ToolkitTestApplication application;
- // ScaleToFill
+ // SCALE_TO_FILL
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION);
- alignment.SetScaling(Alignment::ScaleToFill);
- DALI_TEST_EQUALS(Alignment::ScaleToFill, alignment.GetScaling(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION);
+ alignment.SetScaling(Alignment::SCALE_TO_FILL);
+ DALI_TEST_EQUALS(Alignment::SCALE_TO_FILL, alignment.GetScaling(), TEST_LOCATION);
application.Render();
application.SendNotification();
// For complete line coverage
- alignment.SetAlignmentType(Alignment::HorizontalLeft);
+ alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::HorizontalRight);
+ alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::VerticalTop);
+ alignment.SetAlignmentType(Alignment::VERTICAL_TOP);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::VerticalBottom);
+ alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // ScaleToFitKeepAspect
+ // SCALE_TO_FIT_KEEP_ASPECT
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION);
- alignment.SetScaling(Alignment::ScaleToFitKeepAspect);
- DALI_TEST_EQUALS(Alignment::ScaleToFitKeepAspect, alignment.GetScaling(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION);
+ alignment.SetScaling(Alignment::SCALE_TO_FIT_KEEP_ASPECT);
+ DALI_TEST_EQUALS(Alignment::SCALE_TO_FIT_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION);
application.Render();
application.SendNotification();
// For complete line coverage
- alignment.SetAlignmentType(Alignment::HorizontalLeft);
+ alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::HorizontalRight);
+ alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::VerticalTop);
+ alignment.SetAlignmentType(Alignment::VERTICAL_TOP);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::VerticalBottom);
+ alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // ScaleToFillKeepAspect
+ // SCALE_TO_FILL_KEEP_ASPECT
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION);
- alignment.SetScaling(Alignment::ScaleToFillKeepAspect);
- DALI_TEST_EQUALS(Alignment::ScaleToFillKeepAspect, alignment.GetScaling(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION);
+ alignment.SetScaling(Alignment::SCALE_TO_FILL_KEEP_ASPECT);
+ DALI_TEST_EQUALS(Alignment::SCALE_TO_FILL_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION);
application.Render();
application.SendNotification();
// For complete line coverage
- alignment.SetAlignmentType(Alignment::HorizontalLeft);
+ alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::HorizontalRight);
+ alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::VerticalTop);
+ alignment.SetAlignmentType(Alignment::VERTICAL_TOP);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::VerticalBottom);
+ alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // ShrinkToFit
+ // SHRINK_TO_FIT
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION);
- alignment.SetScaling(Alignment::ShrinkToFit);
- DALI_TEST_EQUALS(Alignment::ShrinkToFit, alignment.GetScaling(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION);
+ alignment.SetScaling(Alignment::SHRINK_TO_FIT);
+ DALI_TEST_EQUALS(Alignment::SHRINK_TO_FIT, alignment.GetScaling(), TEST_LOCATION);
application.Render();
application.SendNotification();
// For complete line coverage
- alignment.SetAlignmentType(Alignment::HorizontalLeft);
+ alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::HorizontalRight);
+ alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::VerticalTop);
+ alignment.SetAlignmentType(Alignment::VERTICAL_TOP);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::VerticalBottom);
+ alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
- // ShrinkToFitKeepAspect
+ // SHRINK_TO_FIT_KEEP_ASPECT
{
Alignment alignment = Alignment::New();
- alignment.Add(RenderableActor::New());
- Stage::GetCurrent().Add(alignment);
+ alignment.Add(Actor::New());
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION);
- alignment.SetScaling(Alignment::ShrinkToFitKeepAspect);
- DALI_TEST_EQUALS(Alignment::ShrinkToFitKeepAspect, alignment.GetScaling(), TEST_LOCATION);
+ DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION);
+ alignment.SetScaling(Alignment::SHRINK_TO_FIT_KEEP_ASPECT);
+ DALI_TEST_EQUALS(Alignment::SHRINK_TO_FIT_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION);
application.Render();
application.SendNotification();
// For complete line coverage
- alignment.SetAlignmentType(Alignment::HorizontalLeft);
+ alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::HorizontalRight);
+ alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::VerticalTop);
+ alignment.SetAlignmentType(Alignment::VERTICAL_TOP);
application.Render();
application.SendNotification();
- alignment.SetAlignmentType(Alignment::VerticalBottom);
+ alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
application.Render();
application.SendNotification();
}
{
ToolkitTestApplication application;
- // ScaleToFill
+ // SCALE_TO_FILL
{
Alignment alignment = Alignment::New();
- DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone);
+ DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE);
- alignment.SetScaling(Alignment::ScaleToFill);
- DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFill);
+ alignment.SetScaling(Alignment::SCALE_TO_FILL);
+ DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FILL);
}
- // ScaleToFitKeepAspect
+ // SCALE_TO_FIT_KEEP_ASPECT
{
Alignment alignment = Alignment::New();
- DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone);
+ DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE);
- alignment.SetScaling(Alignment::ScaleToFitKeepAspect);
- DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFitKeepAspect);
+ alignment.SetScaling(Alignment::SCALE_TO_FIT_KEEP_ASPECT);
+ DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FIT_KEEP_ASPECT);
}
- // ScaleToFillKeepAspect
+ // SCALE_TO_FILL_KEEP_ASPECT
{
Alignment alignment = Alignment::New();
- DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone);
+ DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE);
- alignment.SetScaling(Alignment::ScaleToFillKeepAspect);
- DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFillKeepAspect);
+ alignment.SetScaling(Alignment::SCALE_TO_FILL_KEEP_ASPECT);
+ DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FILL_KEEP_ASPECT);
}
- // ShrinkToFit
+ // SHRINK_TO_FIT
{
Alignment alignment = Alignment::New();
- DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone);
+ DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE);
- alignment.SetScaling(Alignment::ShrinkToFit);
- DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ShrinkToFit);
+ alignment.SetScaling(Alignment::SHRINK_TO_FIT);
+ DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SHRINK_TO_FIT);
}
- // ShrinkToFitKeepAspect
+ // SHRINK_TO_FIT_KEEP_ASPECT
{
Alignment alignment = Alignment::New();
- DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone);
+ DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE);
- alignment.SetScaling(Alignment::ShrinkToFitKeepAspect);
- DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ShrinkToFitKeepAspect);
+ alignment.SetScaling(Alignment::SHRINK_TO_FIT_KEEP_ASPECT);
+ DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SHRINK_TO_FIT_KEEP_ASPECT);
}
END_TEST;
}
catch (DaliException& e)
{
- DALI_TEST_ASSERT(e, "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )", TEST_LOCATION );
+ DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
}
try
}
catch (DaliException& e)
{
- DALI_TEST_ASSERT(e, "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )", TEST_LOCATION );
+ DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
}
try
}
catch (DaliException& e)
{
- DALI_TEST_ASSERT(e, "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )", TEST_LOCATION );
+ DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
}
try
}
catch (DaliException& e)
{
- DALI_TEST_ASSERT(e, "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )", TEST_LOCATION );
+ DALI_TEST_ASSERT(e, "(padding.left >= 0.f) && (padding.top >= 0.f) && (padding.right >= 0.f) && (padding.bottom >= 0.f)", TEST_LOCATION );
}
END_TEST;
}
ToolkitTestApplication application;
Alignment alignment = Alignment::New();
- Stage::GetCurrent().Add(alignment);
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
- Actor actor = RenderableActor::New();
+ Actor actor = Actor::New();
alignment.Add(actor);
DALI_TEST_EQUALS(alignment.GetChildCount(), 1u, TEST_LOCATION);
application.Render();
application.SendNotification();
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
END_TEST;
}
ToolkitTestApplication application;
Alignment alignment = Alignment::New();
- Stage::GetCurrent().Add(alignment);
+ application.GetScene().Add(alignment);
application.Render();
application.SendNotification();
Vector2 size( 100.0f, 200.0f );
- alignment.SetSize(size);
+ alignment.SetProperty( Actor::Property::SIZE, size);
application.Render();
application.SendNotification();
DALI_TEST_EQUALS(size, alignment.GetTargetSize().GetVectorXY(), TEST_LOCATION);
- Stage::GetCurrent().Remove(alignment);
+ application.GetScene().Remove(alignment);
END_TEST;
}
///////////////////////////////////////////////////////////////////////////////
-static bool TouchEventCallback(Actor actor, const TouchEvent& event)
+static bool TouchCallback(Actor actor, const TouchEvent& event)
{
return false;
}
ToolkitTestApplication application;
Alignment alignment = Alignment::New();
- alignment.SetSize(100.0f, 100.0f);
- alignment.SetAnchorPoint(AnchorPoint::TOP_LEFT);
- Stage::GetCurrent().Add(alignment);
+ alignment.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
+ alignment.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
+ application.GetScene().Add(alignment);
- alignment.TouchedSignal().Connect(&TouchEventCallback);
+ alignment.TouchedSignal().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);
ToolkitTestApplication application;
Alignment alignment = Alignment::New();
- Stage::GetCurrent().Add(alignment);
+ application.GetScene().Add(alignment);
alignment.SetKeyInputFocus();
ToolkitTestApplication application;
Alignment alignment = Alignment::New();
- Stage::GetCurrent().Add(alignment);
+ application.GetScene().Add(alignment);
Animation animation = Animation::New(100.0f);
animation.AnimateTo( Property( alignment, Actor::Property::SIZE ), Vector3( 100.0f, 150.0f, 200.0f ) );