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=29442fd53e01d062661cab8daf61b76760ef12a4;hp=457111393dfa55576d5a894efb8fe90f4b2fdc67;hb=dee3ce49e3e1e46c82f024283b51d85734cbb3ff;hpb=2078fd4ac40a042eed5d62239e70745aea8f8fba 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 4571113..29442fd 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" @@ -11,9 +11,11 @@ // INTERNAL INCLUDES #include -#include -#include -#include +#include +#include +#include +#include +#include namespace Dali { @@ -41,12 +43,25 @@ 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; ImageView::ImageView() -: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ) +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ) { } @@ -80,8 +95,8 @@ void ImageView::SetImage( Image image ) mImage = image; - Actor self( Self() ); - InitializeControlRenderer( self, mRenderer, image ); + mVisual = Toolkit::VisualFactory::Get().CreateVisual( image ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 ); RelayoutRequest(); @@ -94,8 +109,8 @@ void ImageView::SetImage( Property::Map map ) mImage.Reset(); mPropertyMap = map; - Actor self( Self() ); - InitializeControlRenderer( self, mRenderer, mPropertyMap ); + mVisual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); Property::Value* widthValue = mPropertyMap.Find( "width" ); if( widthValue ) @@ -136,10 +151,14 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size ) mImageSize = size; } - Actor self( Self() ); - InitializeControlRenderer( self, mRenderer, url, size ); + mVisual = Toolkit::VisualFactory::Get().CreateVisual( url, size ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); - mRenderer.SetSize( mSizeSet ); + // 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 ); RelayoutRequest(); } @@ -152,35 +171,35 @@ Image ImageView::GetImage() const void ImageView::EnablePreMultipliedAlpha( bool preMultipled ) { - if( mRenderer ) + if( mVisual ) { - GetImplementation( mRenderer ).EnablePreMultipliedAlpha( preMultipled ); + Toolkit::GetImplementation( mVisual ).EnablePreMultipliedAlpha( preMultipled ); } } bool ImageView::IsPreMultipliedAlphaEnabled() const { - if( mRenderer ) + if( mVisual ) { - return GetImplementation( mRenderer ).IsPreMultipliedAlphaEnabled(); + return Toolkit::GetImplementation( mVisual ).IsPreMultipliedAlphaEnabled(); } return false; } void ImageView::SetDepthIndex( int depthIndex ) { - if( mRenderer ) + if( mVisual ) { - mRenderer.SetDepthIndex( depthIndex ); + mVisual.SetDepthIndex( depthIndex ); } } Vector3 ImageView::GetNaturalSize() { - if( mRenderer ) + if( mVisual ) { Vector2 rendererNaturalSize; - mRenderer.GetNaturalSize( rendererNaturalSize ); + mVisual.GetNaturalSize( rendererNaturalSize ); return Vector3( rendererNaturalSize ); } @@ -230,37 +249,20 @@ float ImageView::GetWidthForHeight( float height ) // Private methods // -void ImageView::OnStageConnection( int depth ) -{ - Control::OnStageConnection( depth ); - - if( mRenderer ) - { - CustomActor self = Self(); - mRenderer.SetOnStage( self ); - } -} - -void ImageView::OnStageDisconnection() -{ - if( mRenderer ) - { - CustomActor self = Self(); - mRenderer.SetOffStage( self ); - } - - Control::OnStageDisconnection(); -} - void ImageView::OnSizeSet( const Vector3& targetSize ) { Control::OnSizeSet( targetSize ); mSizeSet = targetSize; - if( mRenderer ) + if( mVisual ) { Vector2 size( targetSize ); - mRenderer.SetSize( size ); + + // 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, size ); } } @@ -291,33 +293,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( "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.mRenderer && map.Count() == 1u && shaderValue ) + map = value.GetMap(); + if( map ) { - Property::Map shaderMap; - if( shaderValue->Get( shaderMap ) ) + 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 ) + { + impl.SetImage( *map ); + } + // the property map contains only the custom shader + else if( ( impl.mVisual )&&( map->Count() == 1u )&&( shaderValue ) ) { - Internal::ControlRenderer& renderer = GetImplementation( impl.mRenderer ); - renderer.SetCustomShader( shaderMap ); - if( imageView.OnStage() ) + Property::Map* shaderMap = shaderValue->GetMap(); + if( shaderMap ) { - // force to create new core renderer to use the newly set shader - renderer.SetOffStage( imageView ); - renderer.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 ); + } } } }