From 381954079504d56a53f0719f656ed14964e16fd1 Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 7 Nov 2016 13:33:11 +0000 Subject: [PATCH] Removed use of VisualFactory::InitializeVisual Styling currently uses InitalizeVisual rather than a CreateVisual and RegisterVisual pair. We want to eventually remove InitializeVisual, so pre-emptively removing it's use. Change-Id: I335afadc01060b477dd9420f30b97d3b953c37ea Signed-off-by: David Steele --- examples/styling/image-channel-control-impl.cpp | 3 ++- resources/style/style-example-theme-two.json.in | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/styling/image-channel-control-impl.cpp b/examples/styling/image-channel-control-impl.cpp index 0d19830..1b3c9e1 100644 --- a/examples/styling/image-channel-control-impl.cpp +++ b/examples/styling/image-channel-control-impl.cpp @@ -234,7 +234,8 @@ void ImageChannelControl::SetProperty( BaseObject* object, Property::Index index Property::Map* map = value.GetMap(); if( map ) { - Dali::Toolkit::InitializeVisual( self, impl.mVisual, *map ); + impl.mVisual = Toolkit::VisualFactory::Get().CreateVisual( *map ); + impl.RegisterVisual( Demo::ImageChannelControl::Property::IMAGE_VISUAL, impl.mVisual ); } break; } diff --git a/resources/style/style-example-theme-two.json.in b/resources/style/style-example-theme-two.json.in index 9a99988..f5b194d 100644 --- a/resources/style/style-example-theme-two.json.in +++ b/resources/style/style-example-theme-two.json.in @@ -111,6 +111,11 @@ "delay":0 } } + }, + { + "target":"imageVisual", + "property":"scale", + "targetValue":[1,1,1] } ], "disableVisibilityTransition": -- 2.7.4