X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=03229f9e9ca17840e82aaa17e39b000fa18ab304;hb=7e315e8b217ab571598d8db28df867a5da0b99d7;hp=e98f539edff9b82e36f4f30c2fd45d87174de186;hpb=403ee2c915ca37f3b768bc1567229393adf1f7ed;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 e98f539..03229f9 100644
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -6,13 +6,12 @@
 // 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>
 
 namespace Dali
 {
@@ -35,6 +34,9 @@ BaseHandle Create()
 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
@@ -127,37 +129,64 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size )
 
     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 );
+    Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl, size );
 
     RelayoutRequest();
   }
 }
 
+Image ImageView::GetImage() const
+{
+  return mImage;
+}
+
+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 )
 {
-  mRenderer.SetDepthIndex( depthIndex );
+  if( mRenderer )
+  {
+    mRenderer.SetDepthIndex( depthIndex );
+  }
 }
 
 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.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
@@ -191,6 +220,7 @@ float ImageView::GetWidthForHeight( float height )
   }
 }
 
+
 ///////////////////////////////////////////////////////////
 //
 // Private methods
@@ -218,6 +248,16 @@ void ImageView::OnStageDisconnection()
   Control::OnStageDisconnection();
 }
 
+void ImageView::OnSizeSet( const Vector3& targetSize )
+{
+  Control::OnSizeSet( targetSize );
+
+  if( mRenderer )
+  {
+    Vector2 size( targetSize );
+    mRenderer.SetSize( size );
+  }
+}
 
 ///////////////////////////////////////////////////////////
 //
@@ -261,6 +301,16 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
 
         break;
       }
+
+      case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA:
+      {
+        bool isPre;
+        if( value.Get( isPre ) )
+        {
+          GetImpl(imageView).EnablePreMultipliedAlpha( isPre );
+        }
+        break;
+      }
     }
   }
 }
@@ -273,11 +323,11 @@ Property::Value ImageView::GetProperty( BaseObject* object, Property::Index prop
 
   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;
@@ -287,7 +337,6 @@ Property::Value ImageView::GetProperty( BaseObject* object, Property::Index prop
 
       case Toolkit::ImageView::Property::IMAGE:
       {
-        ImageView& impl = GetImpl( imageview );
         if ( !impl.mUrl.empty() )
         {
           value = impl.mUrl;
@@ -304,6 +353,12 @@ Property::Value ImageView::GetProperty( BaseObject* object, Property::Index prop
         }
         break;
       }
+
+      case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA:
+      {
+        value = impl.IsPreMultipliedAlphaEnabled();
+        break;
+      }
     }
   }