-// 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/internal/controls/renderers/image/image-renderer.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.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>
namespace Dali
{
DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ImageView, Toolkit::Control, Create );
DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "resourceUrl", STRING, RESOURCE_URL )
DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "image", MAP, IMAGE )
+DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "preMultipliedAlpha", BOOLEAN, PRE_MULTIPLIED_ALPHA )
+
+DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT( Toolkit, ImageView, "pixelArea", Vector4(0.f, 0.f, 1.f, 1.f), PIXEL_AREA )
DALI_TYPE_REGISTRATION_END()
} // anonymous namespace
using namespace Dali;
ImageView::ImageView()
-: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) )
+: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) )
{
}
mImage = image;
- Actor self = Self();
- Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, image );
+ Actor self( Self() );
+ mVisual = Toolkit::VisualFactory::Get().CreateVisual( image );
+ RegisterVisual( Toolkit::ImageView::Property::IMAGE, self, 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 );
+ Actor self( Self() );
+ mVisual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap );
+ RegisterVisual( Toolkit::ImageView::Property::IMAGE, self, 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();
mUrl = url;
- if( size.GetWidth() == 0u && size.GetHeight() == 0u )
- {
- mImageSize = ResourceImage::GetImageSize( mUrl );
- }
- else
+ if( size.GetWidth() != 0u && size.GetHeight() != 0u )
{
mImageSize = size;
}
- Actor self = Self();
- Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl, mImageSize );
+ Actor self( Self() );
+ mVisual = Toolkit::VisualFactory::Get().CreateVisual( url, size );
+ RegisterVisual( Toolkit::ImageView::Property::IMAGE, self, mVisual );
+
+ mVisual.SetSize( mSizeSet );
RelayoutRequest();
}
}
+Image ImageView::GetImage() const
+{
+ return mImage;
+}
+
+void ImageView::EnablePreMultipliedAlpha( bool preMultipled )
+{
+ if( mVisual )
+ {
+ Toolkit::GetImplementation( mVisual ).EnablePreMultipliedAlpha( preMultipled );
+ }
+}
+
+bool ImageView::IsPreMultipliedAlphaEnabled() const
+{
+ if( mVisual )
+ {
+ return Toolkit::GetImplementation( mVisual ).IsPreMultipliedAlphaEnabled();
+ }
+ return false;
+}
+
void ImageView::SetDepthIndex( int depthIndex )
{
- mRenderer.SetDepthIndex( depthIndex );
+ if( mVisual )
+ {
+ mVisual.SetDepthIndex( depthIndex );
+ }
}
Vector3 ImageView::GetNaturalSize()
{
- Vector3 size;
+ if( mVisual )
+ {
+ Vector2 rendererNaturalSize;
+ mVisual.GetNaturalSize( rendererNaturalSize );
+ return Vector3( rendererNaturalSize );
+ }
+ Vector3 size;
size.x = mImageSize.GetWidth();
size.y = mImageSize.GetHeight();
- size.z = std::min(size.x, size.y);
if( size.x > 0 && size.y > 0 )
{
+ size.z = std::min(size.x, size.y);
return size;
}
else
}
}
+
///////////////////////////////////////////////////////////
//
// Private methods
//
-void ImageView::OnStageConnection( int depth )
+void ImageView::OnSizeSet( const Vector3& targetSize )
{
- Control::OnStageConnection( depth );
+ Control::OnSizeSet( targetSize );
+ mSizeSet = targetSize;
- if( mRenderer )
+ if( mVisual )
{
- CustomActor self = Self();
- mRenderer.SetOnStage( self );
+ Vector2 size( targetSize );
+ mVisual.SetSize( size );
}
}
-void ImageView::OnStageDisconnection()
-{
- if( mRenderer )
- {
- CustomActor self = Self();
- mRenderer.SetOffStage( self );
- }
-
- Control::OnStageDisconnection();
-}
-
-
///////////////////////////////////////////////////////////
//
// Properties
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 if( value.Get( map ) )
{
- ImageView& impl = GetImpl( imageView );
- impl.SetImage( map );
+ Property::Value* shaderValue = map.Find( Toolkit::Visual::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;
+ if( shaderValue->Get( 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 ) )
+ {
+ impl.EnablePreMultipliedAlpha( isPre );
+ }
break;
}
}
if ( imageview )
{
+ ImageView& impl = GetImpl( imageview );
switch ( propertyIndex )
{
case Toolkit::ImageView::Property::RESOURCE_URL:
{
- ImageView& impl = GetImpl( imageview );
if ( !impl.mUrl.empty() )
{
value = impl.mUrl;
case Toolkit::ImageView::Property::IMAGE:
{
- ImageView& impl = GetImpl( imageview );
if ( !impl.mUrl.empty() )
{
value = impl.mUrl;
}
break;
}
+
+ case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA:
+ {
+ value = impl.IsPreMultipliedAlphaEnabled();
+ break;
+ }
}
}