X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=37147e8a5c9e0755c315e4025c146caeb5a4139c;hb=709f6618b60d366c84e259564c53b6ef0c43b717;hp=03229f9e9ca17840e82aaa17e39b000fa18ab304;hpb=9c779d53223a5eae3be6f8af12954cea364a606b;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 03229f9..37147e8 100644
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
+// Copyright (c) 2016 Samsung Electronics Co., Ltd.
 
 // CLASS HEADER
 #include "image-view-impl.h"
@@ -11,7 +11,10 @@
 
 // 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/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
 {
@@ -44,7 +47,7 @@ DALI_TYPE_REGISTRATION_END()
 using namespace Dali;
 
 ImageView::ImageView()
-: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) )
+: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) )
 {
 }
 
@@ -78,8 +81,9 @@ void ImageView::SetImage( Image image )
 
     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();
@@ -92,8 +96,9 @@ void ImageView::SetImage( Property::Map map )
   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 )
@@ -121,7 +126,7 @@ void ImageView::SetImage( Property::Map map )
 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();
@@ -134,8 +139,11 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size )
       mImageSize = size;
     }
 
-    Actor self = Self();
-    Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl, size );
+    Actor self( Self() );
+    mVisual =  Toolkit::VisualFactory::Get().CreateVisual( url, size );
+    RegisterVisual( Toolkit::ImageView::Property::IMAGE, self, mVisual  );
+
+    mVisual.SetSize( mSizeSet );
 
     RelayoutRequest();
   }
@@ -148,35 +156,35 @@ Image ImageView::GetImage() const
 
 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 );
   }
 
@@ -226,36 +234,15 @@ float ImageView::GetWidthForHeight( float height )
 // 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 )
 {
   Control::OnSizeSet( targetSize );
+  mSizeSet = targetSize;
 
-  if( mRenderer )
+  if( mVisual )
   {
     Vector2 size( targetSize );
-    mRenderer.SetSize( size );
+    mVisual.SetSize( size );
   }
 }
 
@@ -270,6 +257,7 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
 
   if ( imageView )
   {
+    ImageView& impl = GetImpl( imageView );
     switch ( index )
     {
       case Toolkit::ImageView::Property::RESOURCE_URL:
@@ -277,7 +265,7 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
         std::string imageUrl;
         if( value.Get( imageUrl ) )
         {
-          GetImpl( imageView ).SetImage( imageUrl, ImageDimensions() );
+          impl.SetImage( imageUrl, ImageDimensions() );
         }
         break;
       }
@@ -285,20 +273,37 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
       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;
       }
 
@@ -307,7 +312,7 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
         bool isPre;
         if( value.Get( isPre ) )
         {
-          GetImpl(imageView).EnablePreMultipliedAlpha( isPre );
+          impl.EnablePreMultipliedAlpha( isPre );
         }
         break;
       }