Modified to set preview image to default value in widget

I modified to turn off the default value when refactoring,
but I change it for existing behavior compatibility

Change-Id: I342a123e69f73ee4ab1a7bb347e159598cf45abd

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 977581760145d21ed89dbbf99ae45fb1c13e6012..166cb9609509c752d6526b462665e568d4cff7a5 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -213,7 +213,8 @@ WidgetView::WidgetView()
   mResizeRequired( false ),
   mPaused( false ),
   mPausedManually( false ),
-  mWindowVisible( true )
+  mWindowVisible( true ),
+  mPreviewEnable( true )
 {
 }
 
@@ -238,7 +239,8 @@ WidgetView::WidgetView( const std::string& widgetId, const std::string& contentI
   mResizeRequired( false ),
   mPaused( false ),
   mPausedManually( false ),
-  mWindowVisible( true )
+  mWindowVisible( true ),
+  mPreviewEnable( true )
 {
 }
 
@@ -403,17 +405,18 @@ bool WidgetView::CancelTouchEvent()
   return false;
 }
 
-void WidgetView::SetPreviewVisible( bool visible )
+void WidgetView::EnablePreview( bool visible )
 {
-  if( mPreviewImage && IsPreviewVisible() != visible )
+  if( mPreviewImage && IsPreviewEnable() != visible )
   {
+    mPreviewEnable = visible;
     mPreviewImage.SetProperty( Actor::Property::VISIBLE, visible );
   }
 }
 
-bool WidgetView::IsPreviewVisible()
+bool WidgetView::IsPreviewEnable()
 {
-  return mPreviewImage.GetProperty<bool>( Actor::Property::VISIBLE );
+  return mPreviewEnable;
 }
 
 void WidgetView::SetLoadingTextVisible( bool visible )
@@ -738,7 +741,7 @@ void WidgetView::SetProperty( BaseObject* object, Property::Index index, const P
 
         if( value.Get( previewEnabled ) )
         {
-          impl.SetPreviewVisible( previewEnabled );
+          impl.EnablePreview( previewEnabled );
         }
         break;
       }
@@ -845,7 +848,7 @@ Property::Value WidgetView::GetProperty( BaseObject* object, Property::Index ind
       }
       case Dali::WidgetView::WidgetView::Property::PREVIEW:
       {
-        value = impl.IsPreviewVisible();
+        value = impl.IsPreviewEnable();
         break;
       }
       case Dali::WidgetView::WidgetView::Property::LOADING_TEXT:
@@ -1267,7 +1270,7 @@ void WidgetView::CloseRemoteSurface()
 
 void WidgetView::ShowLoadingState( bool show )
 {
-  if( mPreviewImage && IsPreviewVisible() )
+  if( mPreviewImage && IsPreviewEnable() )
   {
     mPreviewImage.SetProperty( Actor::Property::VISIBLE, show );
   }
@@ -1282,7 +1285,7 @@ void WidgetView::ShowLoadingState( bool show )
 
 void WidgetView::ShowRetryState( bool show )
 {
-  if( mPreviewImage && IsPreviewVisible() )
+  if( mPreviewImage && IsPreviewEnable() )
   {
     mPreviewImage.SetProperty( Actor::Property::VISIBLE, false );
   }

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 72de2a26a13ca03b9b29b0e0c53573d2b1416a64..831618b2ec5dd271b2c98cfed4c3802e588a6c85 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.h
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.h
@@ -141,12 +141,12 @@ public: // Internal API
   /**
    * @brief Sets the preview image is visible or not
    */
-  void SetPreviewVisible( bool visible );
+  void EnablePreview( bool visible );
 
   /**
    * @brief Returns the preview visible status
    */
-  bool IsPreviewVisible();
+  bool IsPreviewEnable();
 
   /**
    * @brief Sets the Loading Text is visible or not
@@ -464,6 +464,7 @@ private:
   bool mPaused;                              ///< Check whether widget is paused or not
   bool mPausedManually;                      ///< Check whether widget is paused or not by application
   bool mWindowVisible;                       ///< Check whether window is visible or not
+  bool mPreviewEnable;                      ///< Check whether preview is enable or not
 
   Dali::Property::Map mEffectPropertyMap;    ///< Shader for effect