From c7e19c0123196e055968964a863a3d4c26a14555 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Thu, 18 Feb 2016 13:12:07 +0000 Subject: [PATCH] Updates following rendererType changes Change-Id: I980d7723528705caa2d903c9b36c24c4b744a55e --- examples/gradients/gradients-example.cpp | 2 +- .../image-scaling-and-filtering-example.cpp | 2 +- examples/item-view/item-view-example.cpp | 4 ++-- examples/text-message-field/text-message-field-example.cpp | 2 +- resources/style/demo-theme.json.in | 2 +- resources/style/mobile/demo-theme.json.in | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/gradients/gradients-example.cpp b/examples/gradients/gradients-example.cpp index 4a80036..48e3d97 100644 --- a/examples/gradients/gradients-example.cpp +++ b/examples/gradients/gradients-example.cpp @@ -79,7 +79,7 @@ public: // ---- Gradient for background - mGradientMap.Insert("rendererType", "gradientRenderer"); + mGradientMap.Insert("rendererType", "gradient"); Property::Array stopOffsets; stopOffsets.PushBack( 0.0f ); stopOffsets.PushBack( 0.3f ); diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp index e34c8fe..b5d2407 100644 --- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp +++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp @@ -177,7 +177,7 @@ public: // Background image: Dali::Property::Map backgroundImage; - backgroundImage.Insert( "rendererType", "imageRenderer" ); + backgroundImage.Insert( "rendererType", "image" ); backgroundImage.Insert( "imageUrl", BACKGROUND_IMAGE ); backgroundImage.Insert( "imageDesiredWidth", stage.GetSize().width ); backgroundImage.Insert( "imageDesiredHeight", stage.GetSize().height ); diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp index 3ebc0b5..6d90387 100644 --- a/examples/item-view/item-view-example.cpp +++ b/examples/item-view/item-view-example.cpp @@ -863,7 +863,7 @@ public: // From ItemFactory borderActor.SetColorMode( USE_PARENT_COLOR ); Property::Map borderProperty; - borderProperty.Insert( "rendererType", "borderRenderer" ); + borderProperty.Insert( "rendererType", "border" ); borderProperty.Insert( "borderColor", Color::WHITE ); borderProperty.Insert( "borderSize", ITEM_BORDER_SIZE ); borderProperty.Insert( "antiAliasing", true ); @@ -887,7 +887,7 @@ public: // From ItemFactory checkbox.SetZ( 0.1f ); Property::Map solidColorProperty; - solidColorProperty.Insert( "rendererType", "colorRenderer" ); + solidColorProperty.Insert( "rendererType", "color" ); solidColorProperty.Insert( "blendColor", Vector4(0.f, 0.f, 0.f, 0.6f) ); checkbox.SetProperty( ImageView::Property::IMAGE, solidColorProperty ); diff --git a/examples/text-message-field/text-message-field-example.cpp b/examples/text-message-field/text-message-field-example.cpp index 4a8e3b0..2c861c2 100644 --- a/examples/text-message-field/text-message-field-example.cpp +++ b/examples/text-message-field/text-message-field-example.cpp @@ -89,7 +89,7 @@ public: Control photoBoxA = Control::New(); Dali::Property::Map border; - border.Insert( "rendererType", "borderRenderer" ); + border.Insert( "rendererType", "border" ); border.Insert( "borderColor", Color::WHITE ); border.Insert( "borderSize", 1.f ); photoBoxA.SetProperty( Control::Property::BACKGROUND, border ); diff --git a/resources/style/demo-theme.json.in b/resources/style/demo-theme.json.in index 4eb3e59..8b8eef1 100644 --- a/resources/style/demo-theme.json.in +++ b/resources/style/demo-theme.json.in @@ -69,7 +69,7 @@ { "background": { - "rendererType": "gradientRenderer", + "rendererType": "gradient", "gradientCenter": [240, 400], "gradientRadius": 932, "gradientUnits": "userSpace", diff --git a/resources/style/mobile/demo-theme.json.in b/resources/style/mobile/demo-theme.json.in index c3f75af..79f9803 100644 --- a/resources/style/mobile/demo-theme.json.in +++ b/resources/style/mobile/demo-theme.json.in @@ -82,7 +82,7 @@ { "background": { - "rendererType": "gradientRenderer", + "rendererType": "gradient", "gradientCenter": [360, 640], "gradientRadius": 1468, "gradientUnits": "userSpace", -- 2.7.4