X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=80f1ee472d562a851a80743484d778d427ea6a9a;hb=a7c41c76922b4da643a6a9651e5808f16fc41fac;hp=2cb24bb21812620ee37cf4fb466276a00e037db3;hpb=ada974666c47551b8bfdb9302acc95f91ffda901;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp index 2cb24bb..80f1ee4 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2014 Samsung Electronics Co., Ltd. +// Copyright (c) 2016 Samsung Electronics Co., Ltd. // CLASS HEADER #include "image-view-impl.h" @@ -6,13 +6,16 @@ // EXTERNAL INCLUDES #include #include -#include +#include #include // INTERNAL INCLUDES #include -#include -#include +#include +#include +#include +#include +#include namespace Dali { @@ -33,7 +36,11 @@ BaseHandle Create() // Setup properties, signals and actions using the type-registry. DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ImageView, Toolkit::Control, Create ); +DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "resourceUrl", STRING, RESOURCE_URL ) DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "image", MAP, IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "preMultipliedAlpha", BOOLEAN, PRE_MULTIPLIED_ALPHA ) + +DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT( Toolkit, ImageView, "pixelArea", Vector4(0.f, 0.f, 1.f, 1.f), PIXEL_AREA ) DALI_TYPE_REGISTRATION_END() } // anonymous namespace @@ -41,7 +48,7 @@ DALI_TYPE_REGISTRATION_END() using namespace Dali; ImageView::ImageView() -: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ) +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ) { } @@ -66,129 +73,91 @@ Toolkit::ImageView ImageView::New() void ImageView::SetImage( Image image ) { - if( mImage != image ) - { - mUrl.clear(); - mPropertyMap.Clear(); + // Don't bother comparing if we had a visual previously, just drop old visual and create new one + mImage = image; + mUrl.clear(); + mPropertyMap.Clear(); - mImage = image; + mVisual = Toolkit::VisualFactory::Get().CreateVisual( image ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); - bool newRendererCreated = false; - if( mRenderer ) - { - newRendererCreated = Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, image ); - } - else - { - mRenderer = Toolkit::RendererFactory::Get().GetControlRenderer( image ); - newRendererCreated = true; - } + RelayoutRequest(); +} - //we need to inform any newly created renderers if it is on stage - if( newRendererCreated && Self().OnStage() ) - { - CustomActor self = Self(); - mRenderer.SetOnStage( self ); - } +void ImageView::SetImage( const Property::Map& map ) +{ + // Comparing a property map is too expensive so just creating a new visual + mPropertyMap = map; + mUrl.clear(); + mImage.Reset(); - mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 ); - } + mVisual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); + + RelayoutRequest(); } -void ImageView::SetImage( Property::Map map ) +void ImageView::SetImage( const std::string& url, ImageDimensions size ) { - mPropertyMap = map; + // Don't bother comparing if we had a visual previously, just drop old visual and create new one + mUrl = url; + mImage.Reset(); + mPropertyMap.Clear(); - bool newRendererCreated = false; - if( mRenderer ) - { - newRendererCreated = Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, mPropertyMap ); - } - else - { - mRenderer = Toolkit::RendererFactory::Get().GetControlRenderer( mPropertyMap ); - newRendererCreated = true; - } + mVisual = Toolkit::VisualFactory::Get().CreateVisual( url, size ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); - //we need to inform any newly created renderers if it is on stage - CustomActor self = Self(); - if( newRendererCreated && self.OnStage() ) - { - mRenderer.SetOnStage( self ); - } + RelayoutRequest(); +} - int width = 0; - Property::Value* widthValue = mPropertyMap.Find( "width" ); - if( widthValue ) +Image ImageView::GetImage() const +{ + return mImage; +} + +void ImageView::EnablePreMultipliedAlpha( bool preMultipled ) +{ + if( mVisual ) { - widthValue->Get( width ); + Toolkit::GetImplementation( mVisual ).EnablePreMultipliedAlpha( preMultipled ); } +} - int height = 0; - Property::Value* heightValue = mPropertyMap.Find( "height" ); - if( heightValue ) +bool ImageView::IsPreMultipliedAlphaEnabled() const +{ + if( mVisual ) { - heightValue->Get( height ); + return Toolkit::GetImplementation( mVisual ).IsPreMultipliedAlphaEnabled(); } - - mImageSize = ImageDimensions( width, height ); + return false; } -void ImageView::SetImage( const std::string& url ) +void ImageView::SetDepthIndex( int depthIndex ) { - if( mUrl != url ) + if( mVisual ) { - mImage.Reset(); - mPropertyMap.Clear(); - - mUrl = url; - - bool newRendererCreated = false; - if( mRenderer ) - { - newRendererCreated = Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, mUrl ); - } - else - { - mRenderer = Toolkit::RendererFactory::Get().GetControlRenderer( mUrl ); - newRendererCreated = true; - } - - //we need to inform any newly created renderers if it is on stage - if( newRendererCreated && Self().OnStage() ) - { - CustomActor self = Self(); - mRenderer.SetOnStage( self ); - } - - mImageSize = ResourceImage::GetImageSize( mUrl ); + mVisual.SetDepthIndex( depthIndex ); } } Vector3 ImageView::GetNaturalSize() { - Vector3 size; - - size.x = mImageSize.GetWidth(); - size.y = mImageSize.GetHeight(); - size.z = std::min(size.x, size.y); - - if( size.x > 0 && size.y > 0 ) + if( mVisual ) { - return size; - } - else - { - // if no image then use Control's natural size - return Control::GetNaturalSize(); + Vector2 rendererNaturalSize; + mVisual.GetNaturalSize( rendererNaturalSize ); + return Vector3( rendererNaturalSize ); } + + // if no visual then use Control's natural size + return Control::GetNaturalSize(); } float ImageView::GetHeightForWidth( float width ) { - if( mImageSize.GetWidth() > 0 && mImageSize.GetHeight() > 0 ) + if( mVisual ) { - return GetHeightForWidthBase( width ); + return mVisual.GetHeightForWidth( width ); } else { @@ -198,9 +167,9 @@ float ImageView::GetHeightForWidth( float width ) float ImageView::GetWidthForHeight( float height ) { - if( mImageSize.GetWidth() > 0 && mImageSize.GetHeight() > 0 ) + if( mVisual ) { - return GetWidthForHeightBase( height ); + return mVisual.GetWidthForHeight( height ); } else { @@ -208,34 +177,18 @@ float ImageView::GetWidthForHeight( float height ) } } -/////////////////////////////////////////////////////////// -// -// Private methods -// - -void ImageView::OnStageConnection( int depth ) +void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) { - Control::OnStageConnection( depth ); + Control::OnRelayout( size, container ); - if( mRenderer ) + if( mVisual ) { - CustomActor self = Self(); - mRenderer.SetOnStage( self ); + // Pass in an empty map which uses default transform values meaning our visual fills the control + // Should provide a transform that handles aspect ratio according to image size + mVisual.SetTransformAndSize( Property::Map(), size ); } } -void ImageView::OnStageDisconnection() -{ - if( mRenderer ) - { - CustomActor self = Self(); - mRenderer.SetOffStage( self ); - } - - Control::OnStageDisconnection(); -} - - /////////////////////////////////////////////////////////// // // Properties @@ -247,25 +200,67 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr if ( imageView ) { + ImageView& impl = GetImpl( imageView ); switch ( index ) { - case Toolkit::ImageView::Property::IMAGE: + case Toolkit::ImageView::Property::RESOURCE_URL: { std::string imageUrl; if( value.Get( imageUrl ) ) { - ImageView& impl = GetImpl( imageView ); - impl.SetImage( imageUrl ); + impl.SetImage( imageUrl, ImageDimensions() ); } + break; + } + case Toolkit::ImageView::Property::IMAGE: + { + std::string imageUrl; + Property::Map* map; + if( value.Get( imageUrl ) ) + { + impl.SetImage( imageUrl, ImageDimensions() ); + } // if its not a string then get a Property::Map from the property if possible. - Property::Map map; - if( value.Get( map ) ) + else { - ImageView& impl = GetImpl( imageView ); - impl.SetImage( map ); + map = value.GetMap(); + if( map ) + { + Property::Value* shaderValue = map->Find( Toolkit::DevelVisual::Property::SHADER, CUSTOM_SHADER ); + // set image only if property map contains image information other than custom shader + if( map->Count() > 1u || !shaderValue ) + { + impl.SetImage( *map ); + } + // the property map contains only the custom shader + else if( ( impl.mVisual )&&( map->Count() == 1u )&&( shaderValue ) ) + { + Property::Map* shaderMap = shaderValue->GetMap(); + if( shaderMap ) + { + Internal::Visual::Base& visual = Toolkit::GetImplementation( impl.mVisual ); + visual.SetCustomShader( *shaderMap ); + if( imageView.OnStage() ) + { + // force to create new core renderer to use the newly set shader + visual.SetOffStage( imageView ); + visual.SetOnStage( imageView ); + } + } + } + } } + break; + } + case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA: + { + bool isPre; + if( value.Get( isPre ) ) + { + impl.EnablePreMultipliedAlpha( isPre ); + } break; } } @@ -280,11 +275,20 @@ Property::Value ImageView::GetProperty( BaseObject* object, Property::Index prop if ( imageview ) { + ImageView& impl = GetImpl( imageview ); switch ( propertyIndex ) { + case Toolkit::ImageView::Property::RESOURCE_URL: + { + if ( !impl.mUrl.empty() ) + { + value = impl.mUrl; + } + break; + } + case Toolkit::ImageView::Property::IMAGE: { - ImageView& impl = GetImpl( imageview ); if ( !impl.mUrl.empty() ) { value = impl.mUrl; @@ -301,6 +305,12 @@ Property::Value ImageView::GetProperty( BaseObject* object, Property::Index prop } break; } + + case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA: + { + value = impl.IsPreMultipliedAlphaEnabled(); + break; + } } }