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=c0aece7caf1cf83a13522d937e42b6df4c9e65ff;hp=457111393dfa55576d5a894efb8fe90f4b2fdc67;hb=1972f043026a3e1bdcaad71c17859a8f324d1e6d;hpb=4d4724513d345467aad5d6ff0ff103b191c32a3f 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..c0aece7 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -11,9 +11,9 @@ // INTERNAL INCLUDES #include -#include -#include -#include +#include +#include +#include namespace Dali { @@ -81,7 +81,7 @@ void ImageView::SetImage( Image image ) mImage = image; Actor self( Self() ); - InitializeControlRenderer( self, mRenderer, image ); + InitializeVisual( self, mRenderer, image ); mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 ); RelayoutRequest(); @@ -95,7 +95,7 @@ void ImageView::SetImage( Property::Map map ) mPropertyMap = map; Actor self( Self() ); - InitializeControlRenderer( self, mRenderer, mPropertyMap ); + InitializeVisual( self, mRenderer, mPropertyMap ); Property::Value* widthValue = mPropertyMap.Find( "width" ); if( widthValue ) @@ -137,7 +137,7 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size ) } Actor self( Self() ); - InitializeControlRenderer( self, mRenderer, url, size ); + InitializeVisual( self, mRenderer, url, size ); mRenderer.SetSize( mSizeSet ); @@ -311,7 +311,7 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr Property::Map shaderMap; if( shaderValue->Get( shaderMap ) ) { - Internal::ControlRenderer& renderer = GetImplementation( impl.mRenderer ); + Internal::Visual& renderer = GetImplementation( impl.mRenderer ); renderer.SetCustomShader( shaderMap ); if( imageView.OnStage() ) {