X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fmagnifier%2Fmagnifier-impl.cpp;h=b69313c1bac6641cd2b609a55edb0bda2a271b19;hp=d33627f03976a3761c693ac8e442c07900e56d28;hb=99e2ea03e6d6059f5803d700932df1ff1c848cd3;hpb=f31a7b83577275e88914a00f37c4ff5224336553;ds=sidebyside diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index d33627f..b69313c 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp @@ -29,8 +29,8 @@ #include // INTERNAL INCLUDES -#include -#include +#include +#include namespace Dali { @@ -263,14 +263,14 @@ void Magnifier::SetFrameVisibility(bool visible) Vector3 sizeOffset(IMAGE_BORDER_INDENT*2.f - 2.f, IMAGE_BORDER_INDENT*2.f - 2.f, 0.0f); mFrame.SetSizeModeFactor( sizeOffset ); - Toolkit::VisualFactory rendererFactory = Toolkit::VisualFactory::Get(); + Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get(); Property::Map map; map[ RENDERER_TYPE ] = BORDER_RENDERER; map[ "borderColor" ] = Color::WHITE; map[ "borderSize" ] = IMAGE_BORDER_INDENT; - Toolkit::Visual borderRenderer = rendererFactory.CreateVisual( map ); - borderRenderer.SetOnStage( mFrame ); + Toolkit::Visual::Base borderVisual = visualFactory.CreateVisual( map ); + borderVisual.SetOnStage( mFrame ); Constraint constraint = Constraint::New( mFrame, Actor::Property::POSITION, EqualToConstraint() ); constraint.AddSource( ParentSource( Actor::Property::WORLD_POSITION ) );