/*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "visual-base-impl.h"
// EXTERNAL HEADER
-#include <dali/public-api/common/dali-common.h>
-#include <dali/devel-api/object/handle-devel.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
+#include <dali/devel-api/scripting/enum-helper.h>
+#include <dali/devel-api/rendering/renderer-devel.h>
#include <dali/integration-api/debug.h>
//INTERNAL HEARDER
#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
#include <dali-toolkit/public-api/visuals/primitive-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/internal/helpers/property-helper.h>
#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
#if defined(DEBUG_ENABLED)
Debug::Filter* gVisualBaseLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_VISUAL_BASE" );
#endif
-}
+
+const char * const PRE_MULTIPLIED_ALPHA_PROPERTY( "preMultipliedAlpha" );
+
+} // namespace
namespace Dali
{
namespace Internal
{
-Visual::Base::Base( VisualFactoryCache& factoryCache )
-: mImpl( new Impl() ),
+namespace
+{
+
+DALI_ENUM_TO_STRING_TABLE_BEGIN( VISUAL_FITTING_MODE )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FIT_KEEP_ASPECT_RATIO )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FILL )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, OVER_FIT_KEEP_ASPECT_RATIO )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, CENTER )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FIT_WIDTH )
+DALI_ENUM_TO_STRING_WITH_SCOPE( Visual::FittingMode, FIT_HEIGHT )
+DALI_ENUM_TO_STRING_TABLE_END( VISUAL_FITTING_MODE )
+
+} // namespace
+
+Visual::Base::Base( VisualFactoryCache& factoryCache, FittingMode fittingMode, Toolkit::Visual::Type type )
+: mImpl( new Impl( fittingMode, type ) ),
mFactoryCache( factoryCache )
{
}
{
if( matchKey == CUSTOM_SHADER )
{
- matchKey = Property::Key( DevelVisual::Property::SHADER );
+ matchKey = Property::Key( Toolkit::Visual::Property::SHADER );
}
else if( matchKey == TRANSFORM )
{
- matchKey = Property::Key( DevelVisual::Property::TRANSFORM );
+ matchKey = Property::Key( Toolkit::Visual::Property::TRANSFORM );
}
else if( matchKey == PREMULTIPLIED_ALPHA )
{
- matchKey = Property::Key( DevelVisual::Property::PREMULTIPLIED_ALPHA );
+ matchKey = Property::Key( Toolkit::Visual::Property::PREMULTIPLIED_ALPHA );
}
else if( matchKey == MIX_COLOR )
{
- matchKey = Property::Key( DevelVisual::Property::MIX_COLOR );
+ matchKey = Property::Key( Toolkit::Visual::Property::MIX_COLOR );
}
else if( matchKey == OPACITY )
{
- matchKey = Property::Key( DevelVisual::Property::OPACITY );
+ matchKey = Property::Key( Toolkit::Visual::Property::OPACITY );
+ }
+ else if( matchKey == VISUAL_FITTING_MODE )
+ {
+ matchKey = Property::Key( Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE );
+ }
+ else if( matchKey == CORNER_RADIUS )
+ {
+ matchKey = Property::Key( Toolkit::DevelVisual::Property::CORNER_RADIUS );
+ }
+ else if( matchKey == CORNER_RADIUS_POLICY )
+ {
+ matchKey = Property::Key( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY );
}
}
switch( matchKey.indexKey )
{
- case DevelVisual::Property::SHADER:
+ case Toolkit::Visual::Property::SHADER:
{
Property::Map shaderMap;
if( value.Get( shaderMap ) )
break;
}
- case DevelVisual::Property::TRANSFORM:
+ case Toolkit::Visual::Property::TRANSFORM:
{
Property::Map map;
if( value.Get( map ) )
break;
}
- case DevelVisual::Property::PREMULTIPLIED_ALPHA:
+ case Toolkit::Visual::Property::PREMULTIPLIED_ALPHA:
{
bool premultipliedAlpha = false;
if( value.Get( premultipliedAlpha ) )
break;
}
- case DevelVisual::Property::MIX_COLOR:
+ case Toolkit::Visual::Property::MIX_COLOR:
{
Vector4 mixColor;
if( value.Get( mixColor ) )
}
break;
}
- case DevelVisual::Property::OPACITY:
+ case Toolkit::Visual::Property::OPACITY:
{
float opacity;
if( value.Get( opacity ) )
}
break;
}
+ case Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE:
+ {
+ Scripting::GetEnumerationProperty< Visual::FittingMode >(
+ value, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT, mImpl->mFittingMode );
+ break;
+ }
+ case Toolkit::DevelVisual::Property::CORNER_RADIUS:
+ {
+ float radius;
+ if( value.Get( radius ) )
+ {
+ mImpl->mCornerRadius = radius;
+ }
+ break;
+ }
+ case Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY:
+ {
+ int policy;
+ if( value.Get( policy ) )
+ {
+ switch( policy )
+ {
+ case Toolkit::Visual::Transform::Policy::RELATIVE:
+ case Toolkit::Visual::Transform::Policy::ABSOLUTE:
+ {
+ mImpl->mCornerRadiusPolicy = policy;
+ break;
+ }
+ default:
+ {
+ DALI_LOG_ERROR( "Unsupported policy: %d\n", policy );
+ break;
+ }
+ }
+ }
+ break;
+ }
}
}
mImpl->mName = name;
}
-const std::string& Visual::Base::GetName()
+const std::string& Visual::Base::GetName() const
{
return mImpl->mName;
}
naturalSize = Vector2::ZERO;
}
+void Visual::Base::DoAction( const Property::Index actionId, const Property::Value attributes )
+{
+ OnDoAction( actionId, attributes );
+}
+
void Visual::Base::SetDepthIndex( int index )
{
mImpl->mDepthIndex = index;
return mImpl->mDepthIndex;
}
-void Visual::Base::SetOnStage( Actor& actor )
+void Visual::Base::SetOnScene( Actor& actor )
{
- if( !IsOnStage() )
+ if( !IsOnScene() )
{
// To display the actor correctly, renderer should not be added to actor until all required resources are ready.
// Thus the calling of actor.AddRenderer() should happen inside derived class as base class does not know the exact timing.
- DoSetOnStage( actor );
+ DoSetOnScene( actor );
if( mImpl->mRenderer )
{
RegisterMixColor();
+ if( IsRoundedCornerRequired() )
+ {
+ mImpl->mCornerRadiusIndex = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::CORNER_RADIUS, CORNER_RADIUS, mImpl->mCornerRadius);
+ mImpl->mRenderer.RegisterProperty( CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy );
+
+ mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
+ }
+
mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, IsPreMultipliedAlphaEnabled());
mImpl->mRenderer.SetProperty( Renderer::Property::DEPTH_INDEX, mImpl->mDepthIndex );
- mImpl->mFlags |= Impl::IS_ON_STAGE; // Only sets the flag if renderer exists
+ mImpl->mFlags |= Impl::IS_ON_SCENE; // Only sets the flag if renderer exists
}
}
}
-void Visual::Base::SetOffStage( Actor& actor )
+void Visual::Base::SetOffScene( Actor& actor )
{
- if( IsOnStage() )
+ if( IsOnScene() )
{
- DoSetOffStage( actor );
+ if(mImpl->mRenderer)
+ {
+ // Update values from Renderer
+ mImpl->mMixColor = mImpl->mRenderer.GetProperty<Vector3>(mImpl->mMixColorIndex);
+ mImpl->mMixColor.a = mImpl->mRenderer.GetProperty<float>(DevelRenderer::Property::OPACITY);
+ if(mImpl->mCornerRadiusIndex != Property::INVALID_INDEX)
+ {
+ mImpl->mCornerRadius = mImpl->mRenderer.GetProperty<float>(mImpl->mCornerRadiusIndex);
+ }
+ }
+
+ DoSetOffScene( actor );
mImpl->mMixColorIndex = Property::INVALID_INDEX;
- mImpl->mOpacityIndex = Property::INVALID_INDEX;
- mImpl->mFlags &= ~Impl::IS_ON_STAGE;
+ mImpl->mCornerRadiusIndex = Property::INVALID_INDEX;
+ mImpl->mFlags &= ~Impl::IS_ON_SCENE;
}
}
void Visual::Base::CreatePropertyMap( Property::Map& map ) const
{
- DoCreatePropertyMap( map );
+ if(mImpl->mRenderer)
+ {
+ // Update values from Renderer
+ mImpl->mMixColor = mImpl->mRenderer.GetProperty<Vector3>(mImpl->mMixColorIndex);
+ mImpl->mMixColor.a = mImpl->mRenderer.GetProperty<float>(DevelRenderer::Property::OPACITY);
+ if(mImpl->mCornerRadiusIndex != Property::INVALID_INDEX)
+ {
+ mImpl->mCornerRadius = mImpl->mRenderer.GetProperty<float>(mImpl->mCornerRadiusIndex);
+ }
+ }
- if( mImpl->mCustomShader )
+ DoCreatePropertyMap(map);
+
+ if(mImpl->mCustomShader)
{
- mImpl->mCustomShader->CreatePropertyMap( map );
+ mImpl->mCustomShader->CreatePropertyMap(map);
}
Property::Map transform;
mImpl->mTransform.GetPropertyMap( transform );
- map.Insert( DevelVisual::Property::TRANSFORM, transform );
+ map.Insert( Toolkit::Visual::Property::TRANSFORM, transform );
bool premultipliedAlpha( IsPreMultipliedAlphaEnabled() );
- map.Insert( DevelVisual::Property::PREMULTIPLIED_ALPHA, premultipliedAlpha );
+ map.Insert( Toolkit::Visual::Property::PREMULTIPLIED_ALPHA, premultipliedAlpha );
// Note, Color and Primitive will also insert their own mix color into the map
// which is ok, because they have a different key value range.
- map.Insert( DevelVisual::Property::MIX_COLOR, mImpl->mMixColor ); // vec4
- map.Insert( DevelVisual::Property::OPACITY, mImpl->mMixColor.a );
+ map.Insert( Toolkit::Visual::Property::MIX_COLOR, mImpl->mMixColor ); // vec4
+ map.Insert( Toolkit::Visual::Property::OPACITY, mImpl->mMixColor.a );
+
+ auto fittingModeString = Scripting::GetLinearEnumerationName< FittingMode >(
+ mImpl->mFittingMode, VISUAL_FITTING_MODE_TABLE, VISUAL_FITTING_MODE_TABLE_COUNT );
+ map.Insert( Toolkit::DevelVisual::Property::VISUAL_FITTING_MODE, fittingModeString );
+
+ map.Insert( Toolkit::DevelVisual::Property::CORNER_RADIUS, mImpl->mCornerRadius );
+ map.Insert( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, static_cast< int >( mImpl->mCornerRadiusPolicy ) );
}
void Visual::Base::CreateInstancePropertyMap( Property::Map& map ) const
mImpl->mCustomShader->CreatePropertyMap( map );
}
- //map.Insert( DevelVisual::Property::DEPTH_INDEX, mImpl->mDepthIndex );
- //map.Insert( DevelVisual::Property::ENABLED, (bool) mImpl->mRenderer );
+ //map.Insert( Toolkit::Visual::Property::DEPTH_INDEX, mImpl->mDepthIndex );
+ //map.Insert( Toolkit::Visual::Property::ENABLED, (bool) mImpl->mRenderer );
}
-void Visual::Base::EnablePreMultipliedAlpha( bool preMultipled )
+void Visual::Base::EnablePreMultipliedAlpha( bool preMultiplied )
{
- if( preMultipled )
+ if( preMultiplied )
{
mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA;
}
if( mImpl->mRenderer )
{
- mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, preMultipled);
+ mImpl->mRenderer.SetProperty(Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA, preMultiplied);
+ mImpl->mRenderer.RegisterProperty( PRE_MULTIPLIED_ALPHA_PROPERTY, static_cast<float>( preMultiplied ) );
}
}
return mImpl->mFlags & Impl::IS_PREMULTIPLIED_ALPHA;
}
-void Visual::Base::DoSetOffStage( Actor& actor )
+void Visual::Base::DoSetOffScene( Actor& actor )
{
actor.RemoveRenderer( mImpl->mRenderer );
mImpl->mRenderer.Reset();
}
-bool Visual::Base::IsOnStage() const
+bool Visual::Base::IsOnScene() const
+{
+ return mImpl->mFlags & Impl::IS_ON_SCENE;
+}
+
+bool Visual::Base::IsRoundedCornerRequired() const
{
- return mImpl->mFlags & Impl::IS_ON_STAGE;
+ if(mImpl->mRenderer && mImpl->mCornerRadiusIndex != Property::INVALID_INDEX)
+ {
+ // Update values from Renderer
+ mImpl->mCornerRadius = mImpl->mRenderer.GetProperty<float>(mImpl->mCornerRadiusIndex);
+ }
+ return !EqualsZero(mImpl->mCornerRadius) || mImpl->mNeedCornerRadius;
+}
+
+void Visual::Base::OnDoAction( const Property::Index actionId, const Property::Value& attributes )
+{
+ // May be overriden by derived class
}
void Visual::Base::RegisterMixColor()
// (Color and Primitive visuals will register their own and save to this index)
if( mImpl->mMixColorIndex == Property::INVALID_INDEX )
{
- mImpl->mMixColorIndex = DevelHandle::RegisterProperty(
- mImpl->mRenderer,
- Toolkit::DevelVisual::Property::MIX_COLOR,
+ mImpl->mMixColorIndex = mImpl->mRenderer.RegisterProperty(
+ Toolkit::Visual::Property::MIX_COLOR,
MIX_COLOR,
Vector3(mImpl->mMixColor) );
}
- if( mImpl->mMixColor.a < 1.f )
- {
- mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
- }
-
- if( mImpl->mOpacityIndex == Property::INVALID_INDEX )
- {
- mImpl->mOpacityIndex = DevelHandle::RegisterProperty(
- mImpl->mRenderer,
- Toolkit::DevelVisual::Property::OPACITY,
- OPACITY,
- mImpl->mMixColor.a );
- }
+ mImpl->mRenderer.SetProperty( DevelRenderer::Property::OPACITY, mImpl->mMixColor.a );
float preMultipliedAlpha = 0.0f;
if( IsPreMultipliedAlphaEnabled() )
{
preMultipliedAlpha = 1.0f;
}
- mImpl->mRenderer.RegisterProperty( "preMultipliedAlpha", preMultipliedAlpha );
+ mImpl->mRenderer.RegisterProperty( PRE_MULTIPLIED_ALPHA_PROPERTY, preMultipliedAlpha );
}
void Visual::Base::SetMixColor( const Vector4& color )
if( mImpl->mRenderer )
{
mImpl->mRenderer.SetProperty( mImpl->mMixColorIndex, Vector3(color) );
- mImpl->mRenderer.SetProperty( mImpl->mOpacityIndex, color.a );
- if( color.a < 1.f )
- {
- mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
- }
+ mImpl->mRenderer.SetProperty( DevelRenderer::Property::OPACITY, color.a );
}
}
}
}
-const Vector4& Visual::Base::GetMixColor() const
-{
- return mImpl->mMixColor;
-}
-
-void Visual::Base::AddResourceObserver( Visual::ResourceObserver& observer)
+void Visual::Base::AddEventObserver( Visual::EventObserver& observer)
{
- mImpl->mResourceObserver = &observer;
+ mImpl->mEventObserver = &observer;
}
-void Visual::Base::RemoveResourceObserver( Visual::ResourceObserver& observer )
+void Visual::Base::RemoveEventObserver( Visual::EventObserver& observer )
{
- mImpl->mResourceObserver = NULL;
+ mImpl->mEventObserver = NULL;
}
-void Visual::Base::ResourceReady()
+void Visual::Base::ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus)
{
- if( mImpl->mResourceReady )
+ if( mImpl->mResourceStatus != resourceStatus )
{
- // only inform the observer the first time the resource is ready
- return;
- }
- mImpl->mResourceReady = true;
+ mImpl->mResourceStatus = resourceStatus;
- if( mImpl->mResourceObserver )
- {
- // observer is currently a control impl
- mImpl->mResourceObserver->ResourceReady( *this );
+ if( mImpl->mEventObserver )
+ {
+ // observer is currently a control impl
+ mImpl->mEventObserver->ResourceReady( *this );
+ }
}
}
bool Visual::Base::IsResourceReady() const
{
- return mImpl->mResourceReady;
+ return ( mImpl->mResourceStatus == Toolkit::Visual::ResourceStatus::READY );
+}
+
+bool Visual::Base::IsSynchronousLoadingRequired() const
+{
+ return ( mImpl->mFlags & Impl::IS_SYNCHRONOUS_RESOURCE_LOADING );
+}
+
+Toolkit::Visual::Type Visual::Base::GetType() const
+{
+ return mImpl->mType;
+}
+
+Toolkit::Visual::ResourceStatus Visual::Base::GetResourceStatus() const
+{
+ return mImpl->mResourceStatus;
+}
+
+Visual::FittingMode Visual::Base::GetFittingMode() const
+{
+ return mImpl->mFittingMode;
+}
+
+Visual::Base& Visual::Base::GetVisualObject()
+{
+ return *this;
}
Renderer Visual::Base::GetRenderer()
Property::Index Visual::Base::GetPropertyIndex( Property::Key key )
{
- Property::Index index = DevelHandle::GetPropertyIndex( mImpl->mRenderer, key );
+ Property::Index index = mImpl->mRenderer.GetPropertyIndex( key );
if( index == Property::INVALID_INDEX )
{
// Is it a shader property?
Shader shader = mImpl->mRenderer.GetShader();
- index = DevelHandle::GetPropertyIndex( shader, key );
+ index = shader.GetPropertyIndex( key );
if( index != Property::INVALID_INDEX )
{
// Yes - we should register it in the Renderer so it can be set / animated
// Leave keyIndex as INVALID_KEY - it can still be registered against the string key.
}
Property::Value value = shader.GetProperty( index );
- index = DevelHandle::RegisterProperty( mImpl->mRenderer, keyIndex, keyName, value );
+ index = mImpl->mRenderer.RegisterProperty( keyIndex, keyName, value );
}
}
return index;
}
#endif
- Property::Map map;
- DoCreatePropertyMap( map );
- Property::Value* valuePtr = map.Find( Toolkit::DevelVisual::Property::TYPE );
- int visualType = -1;
- if( valuePtr )
- {
- valuePtr->Get( visualType );
- }
-
- if( animator.propertyKey == Toolkit::DevelVisual::Property::MIX_COLOR ||
- animator.propertyKey == MIX_COLOR ||
- ( visualType == Toolkit::Visual::COLOR &&
- animator.propertyKey == ColorVisual::Property::MIX_COLOR ) ||
- ( visualType == Toolkit::Visual::PRIMITIVE &&
- animator.propertyKey == PrimitiveVisual::Property::MIX_COLOR ) )
+ if(animator.propertyKey == Toolkit::Visual::Property::MIX_COLOR ||
+ animator.propertyKey == MIX_COLOR ||
+ (mImpl->mType == Toolkit::Visual::COLOR &&
+ animator.propertyKey == ColorVisual::Property::MIX_COLOR) ||
+ (mImpl->mType == Toolkit::Visual::PRIMITIVE &&
+ animator.propertyKey == PrimitiveVisual::Property::MIX_COLOR))
{
AnimateMixColorProperty( transition, animator );
}
- else if(animator.propertyKey == Toolkit::DevelVisual::Property::OPACITY ||
+ else if(animator.propertyKey == Toolkit::Visual::Property::OPACITY ||
animator.propertyKey == OPACITY )
{
AnimateOpacityProperty( transition, animator );
Dali::Animation& transition,
Internal::TransitionData::Animator& animator )
{
- Property::Index index = mImpl->mOpacityIndex;
-
- bool isOpaque = mImpl->mMixColor.a >= 1.0f;
-
- if( index != Property::INVALID_INDEX )
+ float targetOpacity;
+ if( animator.targetValue.Get( targetOpacity ) )
{
- float initialOpacity;
- if( animator.initialValue.Get( initialOpacity ) )
- {
- isOpaque = (initialOpacity >= 1.0f);
- }
-
- float targetOpacity;
- if( animator.targetValue.Get( targetOpacity ) )
- {
- mImpl->mMixColor.a = targetOpacity;
- }
-
- SetupTransition( transition, animator, index, animator.initialValue, animator.targetValue );
- SetupBlendMode( transition, isOpaque, animator.animate );
+ mImpl->mMixColor.a = targetOpacity;
}
+
+ SetupTransition( transition, animator, DevelRenderer::Property::OPACITY, animator.initialValue, animator.targetValue );
}
void Visual::Base::AnimateRendererProperty(
{
Property::Index index = mImpl->mMixColorIndex;
bool animateOpacity = false;
- bool isOpaque = true;
Property::Value initialOpacity;
Property::Value targetOpacity;
if( animator.initialValue.GetType() == Property::VECTOR4 )
{
// if there is an initial color specifying alpha, test it
- isOpaque = initialColor.a >= 1.0f;
initialOpacity = initialColor.a;
}
initialMixColor = Vector3( initialColor );
SetupTransition( transition, animator, index, initialMixColor, targetMixColor );
if( animateOpacity )
{
- SetupTransition( transition, animator, mImpl->mOpacityIndex, initialOpacity, targetOpacity );
- SetupBlendMode( transition, isOpaque, animator.animate );
+ SetupTransition( transition, animator, DevelRenderer::Property::OPACITY, initialOpacity, targetOpacity );
}
}
}
-void Visual::Base::SetupBlendMode( Animation& transition, bool isInitialOpaque, bool animating )
+Dali::Property Visual::Base::GetPropertyObject(Dali::Property::Key key)
{
- // Ensure the blend mode is turned on if we are animating opacity, and
- // turned off after the animation ends if the final value is opaque
- if( ! isInitialOpaque || mImpl->mMixColor.a < 1.0f )
+ if(!mImpl->mRenderer)
{
- mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON );
+ Handle handle;
+ return Dali::Property(handle, Property::INVALID_INDEX);
+ }
- if( animating == true && mImpl->mMixColor.a >= 1.0f )
+ // Mix color or opacity cases
+ if(key.type == Property::Key::INDEX)
+ {
+ if(key.indexKey == Toolkit::Visual::Property::MIX_COLOR || (mImpl->mType == Toolkit::Visual::COLOR && key.indexKey == ColorVisual::Property::MIX_COLOR) || (mImpl->mType == Toolkit::Visual::PRIMITIVE && key.indexKey == PrimitiveVisual::Property::MIX_COLOR))
{
- // When it becomes opaque, set the blend mode back to automatically
- if( ! mImpl->mBlendSlotDelegate )
- {
- mImpl->mBlendSlotDelegate = new SlotDelegate<Visual::Base>(this);
- }
- transition.FinishedSignal().Connect( *(mImpl->mBlendSlotDelegate),
- &Visual::Base::OnMixColorFinished );
+ return Dali::Property(mImpl->mRenderer, mImpl->mMixColorIndex);
+ }
+ else if(key.indexKey == Toolkit::Visual::Property::OPACITY)
+ {
+ return Dali::Property(mImpl->mRenderer, DevelRenderer::Property::OPACITY);
+ }
+ }
+ else
+ {
+ if(key.stringKey == MIX_COLOR)
+ {
+ return Dali::Property(mImpl->mRenderer, mImpl->mMixColorIndex);
+ }
+ else if(key.stringKey == OPACITY)
+ {
+ return Dali::Property(mImpl->mRenderer, DevelRenderer::Property::OPACITY);
}
}
-}
-void Visual::Base::OnMixColorFinished( Animation& animation )
-{
- if( mImpl->mRenderer )
+ // Other cases
+ Property::Index index = GetPropertyIndex(key);
+ if(index == Property::INVALID_INDEX)
{
- DALI_LOG_INFO( gVisualBaseLogFilter, Debug::General, "Visual::Base::OnMixColorFinished()\n");
- mImpl->mRenderer.SetProperty( Renderer::Property::BLEND_MODE,
- ( mImpl->mMixColor.a < 1.0 ) ? BlendMode::ON : BlendMode::AUTO );
+ if((key.type == Property::Key::INDEX && key.indexKey == DevelVisual::Property::CORNER_RADIUS) || (key.type == Property::Key::STRING && key.stringKey == CORNER_RADIUS))
+ {
+ // Register CORNER_RADIUS property
+ mImpl->mCornerRadiusIndex = mImpl->mRenderer.RegisterProperty(DevelVisual::Property::CORNER_RADIUS, CORNER_RADIUS, mImpl->mCornerRadius);
+ mImpl->mRenderer.RegisterProperty(CORNER_RADIUS_POLICY, mImpl->mCornerRadiusPolicy);
+ index = mImpl->mCornerRadiusIndex;
+
+ mImpl->mNeedCornerRadius = true;
+
+ // Change shader
+ UpdateShader();
+ }
+ else
+ {
+ // We can't find the property in the base class.
+ // Request to child class
+ return OnGetPropertyObject(key);
+ }
}
- delete mImpl->mBlendSlotDelegate;
- mImpl->mBlendSlotDelegate = NULL;
+
+ return Dali::Property(mImpl->mRenderer, index);
}
} // namespace Internal