X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fmagnifier%2Fmagnifier-impl.cpp;h=12205a6f5493c0f732f23f60f9ffa135f869160b;hb=9217ec0c1d483607ed6c8f08a1d9c238657ba5d6;hp=d3c4defa7a289dcb15abb3081aa04923b6f4c35b;hpb=11ed6421771d05113ae1a6510167d8c2557ac20e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp index d3c4def..12205a6 100644 --- a/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp +++ b/dali-toolkit/internal/controls/magnifier/magnifier-impl.cpp @@ -31,6 +31,8 @@ // INTERNAL INCLUDES #include #include +#include +#include namespace Dali { @@ -141,7 +143,7 @@ Dali::Toolkit::Magnifier Magnifier::New() } Magnifier::Magnifier() -: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mDefaultCameraDistance(1000.f), mActorSize(Vector3::ZERO), mMagnificationFactor(1.0f) @@ -266,11 +268,11 @@ void Magnifier::SetFrameVisibility(bool visible) Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get(); Property::Map map; - map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::BORDER; + map[ Toolkit::DevelVisual::Property::TYPE ] = Toolkit::Visual::BORDER; map[ Toolkit::BorderVisual::Property::COLOR ] = Color::WHITE; map[ Toolkit::BorderVisual::Property::SIZE ] = IMAGE_BORDER_INDENT; Toolkit::Visual::Base borderVisual = visualFactory.CreateVisual( map ); - borderVisual.SetOnStage( mFrame ); + Toolkit::GetImplementation(borderVisual).SetOnStage( mFrame ); Constraint constraint = Constraint::New( mFrame, Actor::Property::POSITION, EqualToConstraint() ); constraint.AddSource( ParentSource( Actor::Property::WORLD_POSITION ) );