projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove OnControl methods & add up-calls
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
image-view
/
image-view-impl.cpp
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
c7f1d8c
..
3eb0144
100644
(file)
--- a/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@
-12,7
+12,6
@@
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
#include <dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.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>
namespace Dali
{
namespace Dali
{
@@
-33,7
+32,11
@@
BaseHandle Create()
// Setup properties, signals and actions using the type-registry.
DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ImageView, Toolkit::Control, Create );
// Setup properties, signals and actions using the type-registry.
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, "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
DALI_TYPE_REGISTRATION_END()
} // anonymous namespace
@@
-41,7
+44,8
@@
DALI_TYPE_REGISTRATION_END()
using namespace Dali;
ImageView::ImageView()
using namespace Dali;
ImageView::ImageView()
-: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) )
+: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ),
+ mPremultipledAlphaEnabled( false )
{
}
{
}
@@
-66,7
+70,9
@@
Toolkit::ImageView ImageView::New()
void ImageView::SetImage( Image image )
{
void ImageView::SetImage( Image image )
{
- if( mImage != image )
+ if( ( mImage != image ) ||
+ ! mUrl.empty() || // If we're changing from a URL type to an Image type
+ ! mPropertyMap.Empty() ) // If we're changing from a property map type to an Image type
{
mUrl.clear();
mPropertyMap.Clear();
{
mUrl.clear();
mPropertyMap.Clear();
@@
-76,59
+82,107
@@
void ImageView::SetImage( Image image )
Actor self = Self();
Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, image );
mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 );
Actor self = Self();
Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, image );
mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 );
+
+ RelayoutRequest();
}
}
void ImageView::SetImage( Property::Map map )
{
}
}
void ImageView::SetImage( Property::Map map )
{
+ mUrl.clear();
+ mImage.Reset();
mPropertyMap = map;
Actor self = Self();
Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mPropertyMap );
mPropertyMap = map;
Actor self = Self();
Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mPropertyMap );
- int width = 0;
Property::Value* widthValue = mPropertyMap.Find( "width" );
if( widthValue )
{
Property::Value* widthValue = mPropertyMap.Find( "width" );
if( widthValue )
{
- widthValue->Get( width );
+ int width;
+ if( widthValue->Get( width ) )
+ {
+ mImageSize = ImageDimensions( width, mImageSize.GetHeight() );
+ }
}
}
- int height = 0;
Property::Value* heightValue = mPropertyMap.Find( "height" );
if( heightValue )
{
Property::Value* heightValue = mPropertyMap.Find( "height" );
if( heightValue )
{
- heightValue->Get( height );
+ int height;
+ if( heightValue->Get( height ) )
+ {
+ mImageSize = ImageDimensions( mImageSize.GetWidth(), height );
+ }
}
}
-
mImageSize = ImageDimensions( width, height
);
+
RelayoutRequest(
);
}
}
-void ImageView::SetImage( const std::string& url )
+void ImageView::SetImage( const std::string& url
, ImageDimensions size
)
{
{
- if( mUrl != url )
+ if( ( mUrl != url ) ||
+ 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();
mPropertyMap.Clear();
mUrl = url;
{
mImage.Reset();
mPropertyMap.Clear();
mUrl = url;
+ if( size.GetWidth() != 0u && size.GetHeight() != 0u )
+ {
+ mImageSize = size;
+ }
+
Actor self = Self();
Actor self = Self();
- Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl );
+ Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl
, size
);
- mImageSize = ResourceImage::GetImageSize( mUrl );
+ RelayoutRequest();
+ }
+}
+
+void ImageView::EnablePreMultipliedAlpha( bool preMultipled )
+{
+ if( mRenderer )
+ {
+ GetImplementation( mRenderer ).EnablePreMultipliedAlpha( preMultipled );
+ }
+}
+
+bool ImageView::IsPreMultipliedAlphaEnabled() const
+{
+ if( mRenderer )
+ {
+ return GetImplementation( mRenderer ).IsPreMultipliedAlphaEnabled();
+ }
+ return false;
+}
+
+void ImageView::SetDepthIndex( int depthIndex )
+{
+ if( mRenderer )
+ {
+ mRenderer.SetDepthIndex( depthIndex );
}
}
Vector3 ImageView::GetNaturalSize()
{
}
}
Vector3 ImageView::GetNaturalSize()
{
- Vector3 size;
+ if( mRenderer )
+ {
+ Vector2 rendererNaturalSize;
+ mRenderer.GetNaturalSize( rendererNaturalSize );
+ return Vector3( rendererNaturalSize );
+ }
+ Vector3 size;
size.x = mImageSize.GetWidth();
size.y = mImageSize.GetHeight();
size.x = mImageSize.GetWidth();
size.y = mImageSize.GetHeight();
- size.z = std::min(size.x, size.y);
if( size.x > 0 && size.y > 0 )
{
if( size.x > 0 && size.y > 0 )
{
+ size.z = std::min(size.x, size.y);
return size;
}
else
return size;
}
else
@@
-162,6
+216,7
@@
float ImageView::GetWidthForHeight( float height )
}
}
}
}
+
///////////////////////////////////////////////////////////
//
// Private methods
///////////////////////////////////////////////////////////
//
// Private methods
@@
-189,6
+244,16
@@
void ImageView::OnStageDisconnection()
Control::OnStageDisconnection();
}
Control::OnStageDisconnection();
}
+void ImageView::OnSizeSet( const Vector3& targetSize )
+{
+ Control::OnSizeSet( targetSize );
+
+ if( mRenderer )
+ {
+ Vector2 size( targetSize );
+ mRenderer.SetSize( size );
+ }
+}
///////////////////////////////////////////////////////////
//
///////////////////////////////////////////////////////////
//
@@
-203,13
+268,23
@@
void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
{
switch ( index )
{
{
switch ( index )
{
+ case Toolkit::ImageView::Property::RESOURCE_URL:
+ {
+ std::string imageUrl;
+ if( value.Get( imageUrl ) )
+ {
+ GetImpl( imageView ).SetImage( imageUrl, ImageDimensions() );
+ }
+ break;
+ }
+
case Toolkit::ImageView::Property::IMAGE:
{
std::string imageUrl;
if( value.Get( imageUrl ) )
{
ImageView& impl = GetImpl( imageView );
case Toolkit::ImageView::Property::IMAGE:
{
std::string imageUrl;
if( value.Get( imageUrl ) )
{
ImageView& impl = GetImpl( imageView );
- impl.SetImage( imageUrl );
+ impl.SetImage( imageUrl
, ImageDimensions()
);
}
// if its not a string then get a Property::Map from the property if possible.
}
// if its not a string then get a Property::Map from the property if possible.
@@
-222,6
+297,16
@@
void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
break;
}
break;
}
+
+ case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA:
+ {
+ bool IsPre;
+ if( value.Get( IsPre ) )
+ {
+ GetImpl(imageView).EnablePreMultipliedAlpha( IsPre );
+ }
+ break;
+ }
}
}
}
}
}
}
@@
-234,11
+319,20
@@
Property::Value ImageView::GetProperty( BaseObject* object, Property::Index prop
if ( imageview )
{
if ( imageview )
{
+ ImageView& impl = GetImpl( imageview );
switch ( propertyIndex )
{
switch ( propertyIndex )
{
+ case Toolkit::ImageView::Property::RESOURCE_URL:
+ {
+ if ( !impl.mUrl.empty() )
+ {
+ value = impl.mUrl;
+ }
+ break;
+ }
+
case Toolkit::ImageView::Property::IMAGE:
{
case Toolkit::ImageView::Property::IMAGE:
{
- ImageView& impl = GetImpl( imageview );
if ( !impl.mUrl.empty() )
{
value = impl.mUrl;
if ( !impl.mUrl.empty() )
{
value = impl.mUrl;
@@
-255,6
+349,12
@@
Property::Value ImageView::GetProperty( BaseObject* object, Property::Index prop
}
break;
}
}
break;
}
+
+ case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA:
+ {
+ value = impl.IsPreMultipliedAlphaEnabled();
+ break;
+ }
}
}
}
}