X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=688e1e51e05d0319b2be8117782ca18882b10f2c;hp=76493a68a44d28277922ffdfc27b31794404064e;hb=99e2ea03e6d6059f5803d700932df1ff1c848cd3;hpb=669373aecf093fe345b679b0ebe1e8056b12af2c 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 76493a6..688e1e5 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -6,13 +6,14 @@ // EXTERNAL INCLUDES #include #include -#include +#include #include // INTERNAL INCLUDES #include -#include -#include +#include +#include +#include namespace Dali { @@ -33,7 +34,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 @@ -66,108 +71,126 @@ Toolkit::ImageView ImageView::New() void ImageView::SetImage( Image image ) { - if( mImage != image ) + if( ( mImage != image ) || + ! mUrl.empty() || // If we're changing from a URL type to an Image type + ! mPropertyMap.Empty() ) // If we're changing from a property map type to an Image type { mUrl.clear(); mPropertyMap.Clear(); mImage = image; - bool newRendererCreated = false; - if( mRenderer ) - { - newRendererCreated = Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, image ); - } - else - { - mRenderer = Toolkit::RendererFactory::Get().GetControlRenderer( image ); - 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 ); - } - + Actor self( Self() ); + InitializeVisual( self, mVisual, image ); mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 ); + + RelayoutRequest(); } } void ImageView::SetImage( Property::Map map ) { - mImage.Reset(); mUrl.clear(); + mImage.Reset(); mPropertyMap = map; - mRenderer = Toolkit::RendererFactory::Get().GetControlRenderer( mPropertyMap ); + Actor self( Self() ); + InitializeVisual( self, mVisual, mPropertyMap ); - //we need to inform any newly created renderers if it is on stage - if( Self().OnStage() ) - { - CustomActor self = Self(); - mRenderer.SetOnStage( self ); - } - - int width = 0; Property::Value* widthValue = mPropertyMap.Find( "width" ); if( widthValue ) { - widthValue->Get( width ); + int width; + if( widthValue->Get( width ) ) + { + mImageSize = ImageDimensions( width, mImageSize.GetHeight() ); + } } - int height = 0; Property::Value* heightValue = mPropertyMap.Find( "height" ); if( heightValue ) { - heightValue->Get( height ); + int height; + if( heightValue->Get( height ) ) + { + mImageSize = ImageDimensions( mImageSize.GetWidth(), height ); + } } - mImageSize = ImageDimensions( width, height ); + RelayoutRequest(); } -void ImageView::SetImage( const std::string& url ) +void ImageView::SetImage( const std::string& url, ImageDimensions size ) { - if( mUrl != url ) + if( ( mUrl != url ) || + mImage || // If we're changing from an Image type to a URL type + ! mPropertyMap.Empty() ) // If we're changing from a property map type to a URL type { mImage.Reset(); mPropertyMap.Clear(); mUrl = url; - bool newRendererCreated = false; - if( mRenderer ) + if( size.GetWidth() != 0u && size.GetHeight() != 0u ) { - newRendererCreated = Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, mUrl ); - } - else - { - mRenderer = Toolkit::RendererFactory::Get().GetControlRenderer( mUrl ); - newRendererCreated = true; + mImageSize = size; } - //we need to inform any newly created renderers if it is on stage - if( newRendererCreated && Self().OnStage() ) - { - CustomActor self = Self(); - mRenderer.SetOnStage( self ); - } + Actor self( Self() ); + InitializeVisual( self, mVisual, url, size ); + + mVisual.SetSize( mSizeSet ); + + RelayoutRequest(); + } +} + +Image ImageView::GetImage() const +{ + return mImage; +} + +void ImageView::EnablePreMultipliedAlpha( bool preMultipled ) +{ + if( mVisual ) + { + Toolkit::GetImplementation( mVisual ).EnablePreMultipliedAlpha( preMultipled ); + } +} - mImageSize = ResourceImage::GetImageSize( mUrl ); +bool ImageView::IsPreMultipliedAlphaEnabled() const +{ + if( mVisual ) + { + return Toolkit::GetImplementation( mVisual ).IsPreMultipliedAlphaEnabled(); + } + return false; +} + +void ImageView::SetDepthIndex( int depthIndex ) +{ + if( mVisual ) + { + mVisual.SetDepthIndex( depthIndex ); } } Vector3 ImageView::GetNaturalSize() { - Vector3 size; + if( mVisual ) + { + Vector2 rendererNaturalSize; + mVisual.GetNaturalSize( rendererNaturalSize ); + return Vector3( rendererNaturalSize ); + } + Vector3 size; size.x = mImageSize.GetWidth(); size.y = mImageSize.GetHeight(); - size.z = std::min(size.x, size.y); - if( size.x > 0 && size.x > 0 ) + if( size.x > 0 && size.y > 0 ) { + size.z = std::min(size.x, size.y); return size; } else @@ -201,6 +224,7 @@ float ImageView::GetWidthForHeight( float height ) } } + /////////////////////////////////////////////////////////// // // Private methods @@ -208,10 +232,35 @@ float ImageView::GetWidthForHeight( float height ) void ImageView::OnStageConnection( int depth ) { - if( mRenderer ) + Control::OnStageConnection( depth ); + + if( mVisual ) + { + CustomActor self = Self(); + mVisual.SetOnStage( self ); + } +} + +void ImageView::OnStageDisconnection() +{ + if( mVisual ) { CustomActor self = Self(); - mRenderer.SetOnStage( self ); + mVisual.SetOffStage( self ); + } + + Control::OnStageDisconnection(); +} + +void ImageView::OnSizeSet( const Vector3& targetSize ) +{ + Control::OnSizeSet( targetSize ); + mSizeSet = targetSize; + + if( mVisual ) + { + Vector2 size( targetSize ); + mVisual.SetSize( size ); } } @@ -226,25 +275,63 @@ 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; + } - // if its not a string then get a Property::Map from the property if possible. + case Toolkit::ImageView::Property::IMAGE: + { + std::string imageUrl; Property::Map map; - if( value.Get( map ) ) + if( value.Get( imageUrl ) ) + { + impl.SetImage( imageUrl, ImageDimensions() ); + } + // if its not a string then get a Property::Map from the property if possible. + else if( value.Get( map ) ) { - ImageView& impl = GetImpl( imageView ); - impl.SetImage( map ); + Property::Value* shaderValue = map.Find( "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; + if( shaderValue->Get( 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; } } @@ -259,11 +346,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; @@ -280,6 +376,12 @@ Property::Value ImageView::GetProperty( BaseObject* object, Property::Index prop } break; } + + case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA: + { + value = impl.IsPreMultipliedAlphaEnabled(); + break; + } } }