X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=1bb4573d9bb58e4ef9094b9982e0d85ff9ea4c91;hb=3ce7d36be1ee547fce618d5454a95487ab901581;hp=f19f390211ac906df3ff37c37f12186ea90f8e9a;hpb=baeb5ad3a0b2b1535c48dfb25f3d7ace66cde857;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 f19f390..1bb4573 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -11,7 +11,7 @@ // INTERNAL INCLUDES #include -#include +#include #include #include #include @@ -43,19 +43,6 @@ DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "preMultipliedAlpha", BOOLEAN, P DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT( Toolkit, ImageView, "pixelArea", Vector4(0.f, 0.f, 1.f, 1.f), PIXEL_AREA ) DALI_TYPE_REGISTRATION_END() - -void SetDefaultTransformMap( Property::Map& transformMap ) -{ - transformMap.Clear(); - transformMap - .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::SIZE, Vector2(1.0f, 1.0f) ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN, Toolkit::Align::CENTER ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE, Vector4::ZERO ); - -} - } // anonymous namespace using namespace Dali; @@ -86,82 +73,41 @@ Toolkit::ImageView ImageView::New() void ImageView::SetImage( Image 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; + // Don't bother comparing if we had a visual previously, just drop old visual and create new one + mImage = image; + mUrl.clear(); + mPropertyMap.Clear(); - mVisual = Toolkit::VisualFactory::Get().CreateVisual( image ); - RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); - mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 ); + mVisual = Toolkit::VisualFactory::Get().CreateVisual( image ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); - RelayoutRequest(); - } + RelayoutRequest(); } -void ImageView::SetImage( Property::Map map ) +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(); - mPropertyMap = map; mVisual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap ); RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); - Property::Value* widthValue = mPropertyMap.Find( "width" ); - if( widthValue ) - { - int width; - if( widthValue->Get( width ) ) - { - mImageSize = ImageDimensions( width, mImageSize.GetHeight() ); - } - } - - Property::Value* heightValue = mPropertyMap.Find( "height" ); - if( heightValue ) - { - int height; - if( heightValue->Get( height ) ) - { - mImageSize = ImageDimensions( mImageSize.GetWidth(), height ); - } - } - RelayoutRequest(); } void ImageView::SetImage( const std::string& url, ImageDimensions size ) { - 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; - - if( size.GetWidth() != 0u && size.GetHeight() != 0u ) - { - mImageSize = size; - } - - mVisual = Toolkit::VisualFactory::Get().CreateVisual( url, size ); - RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); + // Don't bother comparing if we had a visual previously, just drop old visual and create new one + mUrl = url; + mImage.Reset(); + mPropertyMap.Clear(); - // This transform fills the control - // Should provide a transform that handles aspect ratio according to image size - Property::Map transformMap; - SetDefaultTransformMap( transformMap ); - mVisual.SetTransformAndSize( transformMap, mSizeSet ); + mVisual = Toolkit::VisualFactory::Get().CreateVisual( url, size ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); - RelayoutRequest(); - } + RelayoutRequest(); } Image ImageView::GetImage() const @@ -194,6 +140,22 @@ void ImageView::SetDepthIndex( int depthIndex ) } } +void ImageView::OnStageConnection( int depth ) +{ + if( mImage ) + { + mImage.UploadedSignal().Emit( mImage ); + } + + Dali::ResourceImage resourceImage = Dali::ResourceImage::DownCast( mImage ); + if( resourceImage ) + { + resourceImage.LoadingFinishedSignal().Emit( resourceImage ); + } + + Control::OnStageConnection( depth ); // Enabled visuals will be put on stage +} + Vector3 ImageView::GetNaturalSize() { if( mVisual ) @@ -203,27 +165,15 @@ Vector3 ImageView::GetNaturalSize() return Vector3( rendererNaturalSize ); } - Vector3 size; - size.x = mImageSize.GetWidth(); - size.y = mImageSize.GetHeight(); - - if( size.x > 0 && size.y > 0 ) - { - size.z = std::min(size.x, size.y); - return size; - } - else - { - // if no image then use Control's natural size - return Control::GetNaturalSize(); - } + // 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 { @@ -233,9 +183,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 { @@ -243,26 +193,15 @@ float ImageView::GetWidthForHeight( float height ) } } - -/////////////////////////////////////////////////////////// -// -// Private methods -// - -void ImageView::OnSizeSet( const Vector3& targetSize ) +void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) { - Control::OnSizeSet( targetSize ); - mSizeSet = targetSize; + Control::OnRelayout( size, container ); if( mVisual ) { - Vector2 size( targetSize ); - - // This transform fills the control + // 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 - Property::Map transformMap; - SetDefaultTransformMap( transformMap ); - mVisual.SetTransformAndSize( transformMap, size ); + mVisual.SetTransformAndSize( Property::Map(), size ); } } @@ -293,33 +232,37 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr case Toolkit::ImageView::Property::IMAGE: { std::string imageUrl; - Property::Map map; + 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. - else if( value.Get( map ) ) + else { - Property::Value* shaderValue = map.Find( Toolkit::VisualProperty::SHADER, CUSTOM_SHADER ); - // set image only if property map contains image information other than custom shader - if( map.Count() > 1u || !shaderValue ) + map = value.GetMap(); + if( map ) { - 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 ) ) + 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 ) ) { - Internal::Visual::Base& visual = Toolkit::GetImplementation( impl.mVisual ); - visual.SetCustomShader( shaderMap ); - if( imageView.OnStage() ) + Property::Map* shaderMap = shaderValue->GetMap(); + if( shaderMap ) { - // force to create new core renderer to use the newly set shader - visual.SetOffStage( imageView ); - visual.SetOnStage( imageView ); + 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 ); + } } } }