X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-data-impl.cpp;h=631f61b2ac78eabc05e2c15269dacc8e84ad08aa;hb=4be24b21c2acd28b5b14795afe57acbfdfd282ac;hp=4bb7634066fc4267ce66e0bd89f9abbecf794ac1;hpb=b31764bc76595c1ccd58cf4366dcde2cc78e72cf;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp index 4bb7634..631f61b 100644 --- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp @@ -95,7 +95,7 @@ bool GetPolicyFromValue( const Property::Value& value, Vector2& policy ) } else { - Property::Array* array = value.GetArray(); + const Property::Array* array = value.GetArray(); if( array && array->Size() == 2 ) { Toolkit::Visual::Transform::Policy::Type xPolicy = static_cast< Toolkit::Visual::Transform::Policy::Type >( -1 ); // Assign an invalid value so definitely changes @@ -115,7 +115,7 @@ bool GetPolicyFromValue( const Property::Value& value, Vector2& policy ) } // unnamed namespace -Internal::Visual::Base::Impl::Impl(FittingMode fittingMode) +Internal::Visual::Base::Impl::Impl( FittingMode fittingMode, Toolkit::Visual::Type type ) : mCustomShader( NULL ), mBlendSlotDelegate( NULL ), mEventObserver( NULL ), @@ -123,12 +123,14 @@ Internal::Visual::Base::Impl::Impl(FittingMode fittingMode) mMixColor( Color::WHITE ), mControlSize( Vector2::ZERO ), mCornerRadius( 0.0f ), + mCornerRadiusPolicy( 1.0f ), mDepthIndex( 0.0f ), mMixColorIndex( Property::INVALID_INDEX ), mCornerRadiusIndex( Property::INVALID_INDEX ), mFittingMode( fittingMode ), mFlags( 0 ), - mResourceStatus( Toolkit::Visual::ResourceStatus::PREPARING ) + mResourceStatus( Toolkit::Visual::ResourceStatus::PREPARING ), + mType( type ) { }