/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
};
const unsigned int COLOR_MODE_VALUES_COUNT = sizeof( COLOR_MODE_VALUES ) / sizeof( COLOR_MODE_VALUES[0] );
-const StringEnum POSITION_INHERITANCE_MODE_VALUES[] =
-{
- { "INHERIT_PARENT_POSITION", INHERIT_PARENT_POSITION },
- { "USE_PARENT_POSITION", USE_PARENT_POSITION },
- { "USE_PARENT_POSITION_PLUS_LOCAL_POSITION", USE_PARENT_POSITION_PLUS_LOCAL_POSITION },
- { "DONT_INHERIT_POSITION", DONT_INHERIT_POSITION },
-};
-const unsigned int POSITION_INHERITANCE_MODE_VALUES_COUNT = sizeof( POSITION_INHERITANCE_MODE_VALUES ) / sizeof( POSITION_INHERITANCE_MODE_VALUES[0] );
-
const StringEnum DRAW_MODE_VALUES[] =
{
{ "NORMAL", DrawMode::NORMAL },
} // anon namespace
+int UtcDaliValueFromEnum(void)
+{
+ enum class T {
+ None, V1 = 1, V2 = 2
+ };
+
+ Property::Value v1 = T::V1;
+ Property::Value v2 = T::V2;
+
+ T t = T::None;
+ DALI_TEST_CHECK( v1.Get<T>() == T::V1 );
+ DALI_TEST_CHECK( v2.Get<T>() == T::V2 );
+ DALI_TEST_CHECK( v1.Get(t) && t == T::V1 );
+ DALI_TEST_CHECK( v2.Get(t) && t == T::V2 );
+
+ END_TEST;
+}
+
int UtcDaliScriptingNewImageNegative01(void)
{
// Invalid filename
map[ "colorMode" ] = "USE_PARENT_COLOR";
map[ "sensitive" ] = false;
map[ "leaveRequired" ] = true;
- map[ "positionInheritance" ] = "DONT_INHERIT_POSITION";
map[ "drawMode" ] = "OVERLAY_2D";
map[ "inheritOrientation" ] = false;
map[ "inheritScale" ] = false;
DALI_TEST_EQUALS( handle.GetColorMode(), USE_PARENT_COLOR, TEST_LOCATION );
DALI_TEST_EQUALS( handle.IsSensitive(), false, TEST_LOCATION );
DALI_TEST_EQUALS( handle.GetLeaveRequired(), true, TEST_LOCATION );
- DALI_TEST_EQUALS( handle.GetPositionInheritanceMode(), DONT_INHERIT_POSITION, TEST_LOCATION );
DALI_TEST_EQUALS( handle.GetDrawMode(), DrawMode::OVERLAY_2D, TEST_LOCATION );
DALI_TEST_EQUALS( handle.IsOrientationInherited(), false, TEST_LOCATION );
DALI_TEST_EQUALS( handle.IsScaleInherited(), false, TEST_LOCATION );
map[ "position" ] = Vector3::XAXIS;
Property::Map child1Map;
- child1Map[ "type" ] = "CameraActor";
+ child1Map[ "type" ] = "Layer";
child1Map[ "position" ] = Vector3::YAXIS;
Property::Array childArray;
Actor child1 = handle.GetChildAt(0);
DALI_TEST_CHECK( child1 );
- DALI_TEST_CHECK( CameraActor::DownCast( child1 ) );
+ DALI_TEST_CHECK( Layer::DownCast( child1 ) );
DALI_TEST_EQUALS( child1.GetCurrentPosition(), Vector3::YAXIS, TEST_LOCATION );
DALI_TEST_EQUALS( child1.GetChildCount(), 0u, TEST_LOCATION );
// ColorMode
TestEnumStrings< ColorMode >( "colorMode", application, COLOR_MODE_VALUES, COLOR_MODE_VALUES_COUNT, &Actor::SetColorMode );
- // PositionInheritanceMode
- TestEnumStrings< PositionInheritanceMode >( "positionInheritance", application, POSITION_INHERITANCE_MODE_VALUES, POSITION_INHERITANCE_MODE_VALUES_COUNT, &Actor::SetPositionInheritanceMode );
-
// DrawMode
TestEnumStrings< DrawMode::Type >( "drawMode", application, DRAW_MODE_VALUES, DRAW_MODE_VALUES_COUNT, &Actor::SetDrawMode );