Apply cornerRadius in preview

Change-Id: Ib4ed0824b24051d4d3247f6070509b18a3c0fdeb

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
index 7c28c2c6c2e9d69c3fc5189188f37218ebe90f2b..136514d60f7b5effdbdcc98814565a41b597f293 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -33,6 +33,7 @@
 #include <dali/public-api/actors/camera-actor.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
 #include <dali-toolkit/public-api/image-loader/image.h>
 #include <dali-toolkit/public-api/image-loader/image-url.h>
 #include <dali-toolkit/public-api/visuals/visual-properties.h>
@@ -454,10 +455,18 @@ bool WidgetView::CancelTouchEvent()
 
 void WidgetView::EnablePreview( bool visible )
 {
-  if( mPreviewImage && IsPreviewEnable() != visible )
+  if( IsPreviewEnable() != visible )
   {
     mPreviewEnable = visible;
-    mPreviewImage.SetProperty( Actor::Property::VISIBLE, visible );
+
+    Property::Map map;
+    map[Toolkit::Visual::Property::OPACITY] = visible? 1.0f : 0.0f;
+    Toolkit::Visual::Base widgetVisual = Dali::Toolkit::DevelControl::GetVisual(*this,  Dali::WidgetView::WidgetView::Property::WIDGET_ID);
+    if(widgetVisual)
+    {
+      Dali::WidgetView::WidgetView handle( GetOwner() );
+      Dali::Toolkit::DevelControl::DoAction(handle, Dali::WidgetView::WidgetView::Property::WIDGET_ID, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, map);
+    }
   }
 }
 
@@ -1051,17 +1060,9 @@ void WidgetView::OnInitialize()
   mPreviewActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
   mPreviewActor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
   mPreviewActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-
-  mPreviewImage = Toolkit::ImageView::New( previewImage );
-  mPreviewImage.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-  mPreviewImage.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
-  mPreviewImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-
   self.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
   self.SetProperty( Actor::Property::SIZE, Vector2(mWidth, mHeight));
-
   self.Add( mPreviewActor );
-  mPreviewActor.Add( mPreviewImage );
 
   mStateTextActor = Dali::Actor::New();
   mStateTextActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
@@ -1096,8 +1097,9 @@ void WidgetView::OnInitialize()
 
   // Create WidgetVisual for WidgetView
   Property::Map propertyMap;
-  propertyMap.Insert(Dali::Toolkit::Visual::Property::TYPE, Dali::Toolkit::Visual::COLOR);
-  propertyMap.Insert(Dali::Toolkit::Visual::Property::MIX_COLOR, Color::TRANSPARENT);
+  propertyMap.Insert(Dali::Toolkit::Visual::Property::TYPE, Dali::Toolkit::Visual::IMAGE);
+  propertyMap.Insert(Dali::Toolkit::ImageVisual::Property::URL, previewImage);
+  //propertyMap.Insert(Dali::Toolkit::Visual::Property::MIX_COLOR, Color::TRANSPARENT);
   Toolkit::Visual::Base widgetVisual = Toolkit::VisualFactory::Get().CreateVisual(propertyMap);
   if(widgetVisual)
   {
@@ -1458,9 +1460,16 @@ void WidgetView::CloseRemoteSurface()
 
 void WidgetView::ShowLoadingState( bool show )
 {
-  if( mPreviewImage && IsPreviewEnable() )
+  if( IsPreviewEnable() )
   {
-    mPreviewImage.SetProperty( Actor::Property::VISIBLE, show );
+    Property::Map map;
+    map[Toolkit::Visual::Property::OPACITY] = show? 1.0f : 0.0f;
+    Toolkit::Visual::Base widgetVisual = Dali::Toolkit::DevelControl::GetVisual(*this,  Dali::WidgetView::WidgetView::Property::WIDGET_ID);
+    if(widgetVisual)
+    {
+      Dali::WidgetView::WidgetView handle( GetOwner() );
+      Dali::Toolkit::DevelControl::DoAction(handle, Dali::WidgetView::WidgetView::Property::WIDGET_ID, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, map);
+    }
   }
 
   if( mLoadingText && IsLoadingTextVisible() )
@@ -1473,9 +1482,16 @@ void WidgetView::ShowLoadingState( bool show )
 
 void WidgetView::ShowRetryState( bool show )
 {
-  if( mPreviewImage && IsPreviewEnable() )
+  if( IsPreviewEnable() )
   {
-    mPreviewImage.SetProperty( Actor::Property::VISIBLE, false );
+    Property::Map map;
+    map[Toolkit::Visual::Property::OPACITY] = 0.0f;
+    Toolkit::Visual::Base widgetVisual = Dali::Toolkit::DevelControl::GetVisual(*this,  Dali::WidgetView::WidgetView::Property::WIDGET_ID);
+    if(widgetVisual)
+    {
+      Dali::WidgetView::WidgetView handle( GetOwner() );
+      Dali::Toolkit::DevelControl::DoAction(handle, Dali::WidgetView::WidgetView::Property::WIDGET_ID, Dali::Toolkit::DevelVisual::Action::UPDATE_PROPERTY, map);
+    }
   }
 
   if( mRetryText && IsRetryTextVisible() )

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.h b/widget_viewer_dali/internal/widget_view/widget_view_impl.h
index 621b8ed8c25d13c33e6318e7cb7d722277e1cbe4..670c357ae269c4fbf031c5430d95fb888782ef3c 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.h
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.h
@@ -522,7 +522,6 @@ private:
   int mPid;
   float mUpdatePeriod;
 
-  Toolkit::ImageView mPreviewImage;          ///< Preview image
   Toolkit::TextLabel mLoadingText;           ///< Loading text
   Toolkit::TextLabel mRetryText;             ///< Retry text
   Dali::Actor mPreviewActor;                 ///< Preview Actor