From: Ferran Sole Date: Wed, 23 Nov 2016 09:31:53 +0000 (+0000) Subject: Changes following patch "Visuals - Avoid having 2 devel headers for visual-properties.h" X-Git-Tag: dali_1.2.16~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=599f271c522bea2ef343a93fb466b6ee76fd0297 Changes following patch "Visuals - Avoid having 2 devel headers for visual-properties.h" Change-Id: Ifa99fb377a65b3670da1b4b680aa441a22996bfe --- diff --git a/examples/styling/image-channel-control-impl.cpp b/examples/styling/image-channel-control-impl.cpp index 63a0935..8db5e39 100644 --- a/examples/styling/image-channel-control-impl.cpp +++ b/examples/styling/image-channel-control-impl.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include @@ -181,11 +181,11 @@ void ImageChannelControl::OnSizeSet( const Vector3& targetSize ) Vector2 size( targetSize ); Property::Map transformMap; transformMap - .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::SIZE, Vector2(1.0f, 1.0f) ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN, Toolkit::Align::CENTER ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE, Vector4::ZERO ); + .Add( Toolkit::DevelVisual::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) ) + .Add( Toolkit::DevelVisual::Transform::Property::SIZE, Vector2(1.0f, 1.0f) ) + .Add( Toolkit::DevelVisual::Transform::Property::ORIGIN, Toolkit::Align::CENTER ) + .Add( Toolkit::DevelVisual::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER ) + .Add( Toolkit::DevelVisual::Transform::Property::OFFSET_SIZE_MODE, Vector4::ZERO ); mVisual.SetTransformAndSize( transformMap, size ); }