X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=89e4c7b5877148caffa368f135bb7e7640f01ae6;hb=f8b44eeacea1fc7c96d84eb3754d7b4a4884b49f;hp=3a0063acdb43a751d31c98fda5bfafa15440ad16;hpb=805ae527fca54726f894fb9936c288c7c0f7dbe7;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 3a0063a..89e4c7b 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 { @@ -46,7 +48,7 @@ DALI_TYPE_REGISTRATION_END() using namespace Dali; ImageView::ImageView() -: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ) +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ) { } @@ -80,8 +82,8 @@ void ImageView::SetImage( Image image ) mImage = image; - Actor self( Self() ); - InitializeVisual( 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 +96,8 @@ void ImageView::SetImage( Property::Map map ) mImage.Reset(); mPropertyMap = map; - Actor self( Self() ); - InitializeVisual( 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 +138,8 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size ) mImageSize = size; } - Actor self( Self() ); - InitializeVisual( self, mRenderer, url, size ); - - mRenderer.SetSize( mSizeSet ); + mVisual = Toolkit::VisualFactory::Get().CreateVisual( url, size ); + RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); RelayoutRequest(); } @@ -152,35 +152,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 ); } @@ -224,43 +224,15 @@ 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() +void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) { - if( mRenderer ) - { - CustomActor self = Self(); - mRenderer.SetOffStage( self ); - } + Control::OnRelayout( size, container ); - Control::OnStageDisconnection(); -} - -void ImageView::OnSizeSet( const Vector3& targetSize ) -{ - Control::OnSizeSet( targetSize ); - mSizeSet = targetSize; - - if( mRenderer ) + if( mVisual ) { - Vector2 size( targetSize ); - mRenderer.SetSize( size ); + // 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 ); } } @@ -291,33 +263,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::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& 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 ); + } } } }