Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
Property::Map* resultMap = propValue.GetMap();
DALI_TEST_CHECK( resultMap->Find( "rendererType" ) );
- DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "colorRenderer" );
- DALI_TEST_CHECK( resultMap->Find( "blendColor" ) );
- DALI_TEST_CHECK( resultMap->Find( "blendColor" )->Get<Vector4>() == Color::RED );
+ DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "color" );
+ DALI_TEST_CHECK( resultMap->Find( "mixColor" ) );
+ DALI_TEST_CHECK( resultMap->Find( "mixColor" )->Get<Vector4>() == Color::RED );
DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::RED, TEST_LOCATION );
propValue = control.GetProperty( Control::Property::BACKGROUND );
resultMap = propValue.GetMap();
- DALI_TEST_CHECK( resultMap->Find( "blendColor" ) );
- DALI_TEST_CHECK( resultMap->Find( "blendColor" )->Get<Vector4>() == Color::YELLOW );
+ DALI_TEST_CHECK( resultMap->Find( "mixColor" ) );
+ DALI_TEST_CHECK( resultMap->Find( "mixColor" )->Get<Vector4>() == Color::YELLOW );
DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::YELLOW, TEST_LOCATION );
Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
Property::Map* resultMap = propValue.GetMap();
DALI_TEST_CHECK( resultMap->Find( "rendererType" ) );
- DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "imageRenderer" );
- DALI_TEST_CHECK( resultMap->Find( "imageUrl" ) );
- DALI_TEST_CHECK( resultMap->Find( "imageUrl" )->Get<std::string>() == "TestImage" );
+ DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "image" );
+ DALI_TEST_CHECK( resultMap->Find( "url" ) );
+ DALI_TEST_CHECK( resultMap->Find( "url" )->Get<std::string>() == "TestImage" );
image = ResourceImage::New("TestImage2");
control.SetBackgroundImage( image );
propValue = control.GetProperty( Control::Property::BACKGROUND );
resultMap = propValue.GetMap();
- DALI_TEST_CHECK( resultMap->Find( "imageUrl" ) );
- DALI_TEST_CHECK( resultMap->Find( "imageUrl" )->Get<std::string>() == "TestImage2" );
+ DALI_TEST_CHECK( resultMap->Find( "url" ) );
+ DALI_TEST_CHECK( resultMap->Find( "url" )->Get<std::string>() == "TestImage2" );
END_TEST;
}
DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION );
DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND ).Get< Property::Map >().Empty() );
- Property::Map colorMap;
- colorMap["color"] = Color::RED;
- control.SetProperty( Control::Property::BACKGROUND, colorMap );
- Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
- Property::Map* resultMap = propValue.GetMap();
- DALI_TEST_CHECK( resultMap->Find( "rendererType" ) );
- DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "colorRenderer" );
- DALI_TEST_CHECK( resultMap->Find( "blendColor" ) );
- DALI_TEST_CHECK( resultMap->Find( "blendColor" )->Get<Vector4>() == Color::RED );
-
Property::Map imageMap;
- imageMap[ "filename" ] = "TestImage";
+ imageMap[ "rendererType" ] = "image";
+ imageMap[ "url" ] = "TestImage";
control.SetProperty( Control::Property::BACKGROUND, imageMap );
- propValue = control.GetProperty( Control::Property::BACKGROUND );
- resultMap = propValue.GetMap();
+ Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND );
+ Property::Map* resultMap = propValue.GetMap();
DALI_TEST_CHECK( resultMap->Find( "rendererType" ) );
- DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "imageRenderer" );
- DALI_TEST_CHECK( resultMap->Find( "imageUrl" ) );
- DALI_TEST_CHECK( resultMap->Find( "imageUrl" )->Get<std::string>() == "TestImage" );
+ DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "image" );
+ DALI_TEST_CHECK( resultMap->Find( "url" ) );
+ DALI_TEST_CHECK( resultMap->Find( "url" )->Get<std::string>() == "TestImage" );
Property::Map rendererMap;
- rendererMap["rendererType"] = "colorRenderer";
- rendererMap["blendColor"] = Color::CYAN;
+ rendererMap["rendererType"] = "color";
+ rendererMap["mixColor"] = Color::CYAN;
control.SetProperty( Control::Property::BACKGROUND, rendererMap );
propValue = control.GetProperty( Control::Property::BACKGROUND );
resultMap = propValue.GetMap();
DALI_TEST_CHECK( resultMap->Find( "rendererType" ) );
- DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "colorRenderer" );
- DALI_TEST_CHECK( resultMap->Find( "blendColor" ) );
- DALI_TEST_CHECK( resultMap->Find( "blendColor" )->Get<Vector4>() == Color::CYAN );
+ DALI_TEST_CHECK( resultMap->Find( "rendererType" )->Get<std::string>() == "color" );
+ DALI_TEST_CHECK( resultMap->Find( "mixColor" ) );
+ DALI_TEST_CHECK( resultMap->Find( "mixColor" )->Get<Vector4>() == Color::CYAN );
Property::Map emptyMap;
control.SetProperty( Control::Property::BACKGROUND, emptyMap );
DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND_COLOR ).Get< Vector4 >() == Color::YELLOW );
DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND_COLOR ).Get< Vector4 >() == control.GetBackgroundColor() );
control.ClearBackground();
- control.SetProperty( Control::Property::BACKGROUND_IMAGE, imageMap );
+
+ Property::Map deprecatedImageMap;
+ deprecatedImageMap[ "filename" ] = "TestImage";
+ control.SetProperty( Control::Property::BACKGROUND_IMAGE, deprecatedImageMap );
propValue = control.GetProperty( Control::Property::BACKGROUND_IMAGE );
resultMap = propValue.GetMap();
- DALI_TEST_CHECK( resultMap->Find( "imageUrl" )->Get< std::string >() == "TestImage" );
+ DALI_TEST_CHECK( resultMap->Find( "url" )->Get< std::string >() == "TestImage" );
control.SetProperty( Control::Property::BACKGROUND_IMAGE, emptyMap );
DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND_IMAGE ).Get< Property::Map >().Empty() );