-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
+// Copyright (c) 2016 Samsung Electronics Co., Ltd.
// CLASS HEADER
#include "image-view-impl.h"
// EXTERNAL INCLUDES
#include <dali/public-api/images/resource-image.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/devel-api/object/type-registry-helper.h>
+#include <dali/public-api/object/type-registry-helper.h>
#include <dali/devel-api/scripting/scripting.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
-#include <dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/internal/visuals/visual-string-constants.h>
+#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
namespace Dali
{
using namespace Dali;
ImageView::ImageView()
-: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),
- mPremultipledAlphaEnabled( false )
+: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) )
{
}
mImage = image;
- Actor self = Self();
- Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, image );
+ mVisual = Toolkit::VisualFactory::Get().CreateVisual( image );
+ RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual );
mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 );
RelayoutRequest();
mImage.Reset();
mPropertyMap = map;
- Actor self = Self();
- Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mPropertyMap );
+ mVisual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap );
+ RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual );
Property::Value* widthValue = mPropertyMap.Find( "width" );
if( widthValue )
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
+ 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();
mImageSize = size;
}
- Actor self = Self();
- Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl, size );
+ mVisual = Toolkit::VisualFactory::Get().CreateVisual( url, size );
+ RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual );
RelayoutRequest();
}
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 );
}
}
}
-
-///////////////////////////////////////////////////////////
-//
-// 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 )
+void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container )
{
- Control::OnSizeSet( targetSize );
+ Control::OnRelayout( size, container );
- 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 );
}
}
if ( imageView )
{
+ ImageView& impl = GetImpl( imageView );
switch ( index )
{
case Toolkit::ImageView::Property::RESOURCE_URL:
std::string imageUrl;
if( value.Get( imageUrl ) )
{
- GetImpl( imageView ).SetImage( imageUrl, ImageDimensions() );
+ impl.SetImage( imageUrl, ImageDimensions() );
}
break;
}
case Toolkit::ImageView::Property::IMAGE:
{
std::string imageUrl;
+ Property::Map* map;
if( value.Get( imageUrl ) )
{
- ImageView& impl = GetImpl( imageView );
impl.SetImage( imageUrl, ImageDimensions() );
}
-
// if its not a string then get a Property::Map from the property if possible.
- Property::Map map;
- if( value.Get( map ) )
+ else
{
- ImageView& impl = GetImpl( imageView );
- impl.SetImage( map );
+ map = value.GetMap();
+ if( map )
+ {
+ 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 ) )
+ {
+ Property::Map* shaderMap = shaderValue->GetMap();
+ if( 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 ) )
+ bool isPre;
+ if( value.Get( isPre ) )
{
- GetImpl(imageView).EnablePreMultipliedAlpha( IsPre );
+ impl.EnablePreMultipliedAlpha( isPre );
}
break;
}