X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-vector-image%2Fanimated-vector-image-visual.cpp;h=a2d102a10a768d5f8635ec1bc2477450a5ef8018;hp=93c096624e41827e9813698cd5d6c8b9311d616a;hb=55e5ea8082729deca6f0f43f01aeae8dd51a4bdb;hpb=b86fa7f2bedebe580b0e9a20f9b42cf2d628fafa diff --git a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp index 93c0966..a2d102a 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp +++ b/dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp @@ -95,7 +95,8 @@ AnimatedVectorImageVisual::AnimatedVectorImageVisual( VisualFactoryCache& factor mPlayState( DevelImageVisual::PlayState::STOPPED ), mEventCallback( nullptr ), mRendererAdded( false ), - mCoreShutdown(false) + mCoreShutdown(false), + mRedrawInScalingDown(true) { // the rasterized image is with pre-multiplied alpha format mImpl->mFlags |= Impl::IS_PREMULTIPLIED_ALPHA; @@ -172,6 +173,7 @@ void AnimatedVectorImageVisual::DoCreatePropertyMap( Property::Map& map ) const map.Insert( Toolkit::DevelImageVisual::Property::STOP_BEHAVIOR, mAnimationData.stopBehavior ); map.Insert( Toolkit::DevelImageVisual::Property::LOOPING_MODE, mAnimationData.loopingMode ); + map.Insert( Toolkit::DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, mRedrawInScalingDown ); Property::Map layerInfo; mVectorAnimationTask->GetLayerInfo( layerInfo ); @@ -211,6 +213,10 @@ void AnimatedVectorImageVisual::DoSetProperties( const Property::Map& propertyMa { DoSetProperty( Toolkit::DevelImageVisual::Property::LOOPING_MODE, keyValue.second ); } + else if( keyValue.first == REDRAW_IN_SCALING_DOWN_NAME ) + { + DoSetProperty( Toolkit::DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN, keyValue.second ); + } } } @@ -261,6 +267,15 @@ void AnimatedVectorImageVisual::DoSetProperty( Property::Index index, const Prop } break; } + case Toolkit::DevelImageVisual::Property::REDRAW_IN_SCALING_DOWN: + { + bool redraw; + if( value.Get( redraw ) ) + { + mRedrawInScalingDown = redraw; + } + break; + } } } @@ -531,15 +546,19 @@ void AnimatedVectorImageVisual::OnScaleNotification( PropertyNotification& sourc if( actor ) { Vector3 scale = actor.GetProperty< Vector3 >( Actor::Property::WORLD_SCALE ); - mVisualScale.width = scale.width; - mVisualScale.height = scale.height; - DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnScaleNotification: scale = %f, %f [%p]\n", mVisualScale.width, mVisualScale.height, this ); + if(mRedrawInScalingDown || scale.width >= 1.0f || scale.height >= 1.0f) + { + mVisualScale.width = scale.width; + mVisualScale.height = scale.height; - SetVectorImageSize(); - SendAnimationData(); + DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "AnimatedVectorImageVisual::OnScaleNotification: scale = %f, %f [%p]\n", mVisualScale.width, mVisualScale.height, this ); - Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger event processing + SetVectorImageSize(); + SendAnimationData(); + + Stage::GetCurrent().KeepRendering( 0.0f ); // Trigger event processing + } } }