Modified relation between preview and loading-text for disable mode

Change-Id: I955a3d7546754b968119417e2c79082bd94d2e85

diff --git a/internal/widget_view/widget_view_impl.cpp b/internal/widget_view/widget_view_impl.cpp
index 5e88409..346e7ee 100644 (file)
--- a/internal/widget_view/widget_view_impl.cpp
+++ b/internal/widget_view/widget_view_impl.cpp
@@ -709,31 +709,38 @@ void WidgetView::OnInitialize()
 
   DALI_LOG_INFO( gWidgetViewLogging, Debug::Verbose, "WidgetView::OnInitialize: preview image path = %s\n", previewImage.c_str() );
 
-  mPreviewImage = Toolkit::ImageView::New( previewImage );
 
+  mPreviewActor = Dali::Actor::New();
+  mPreviewActor.SetParentOrigin( ParentOrigin::CENTER );
+  mPreviewActor.SetAnchorPoint( AnchorPoint::CENTER );
+  mPreviewActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+
+  mPreviewImage = Toolkit::ImageView::New( previewImage );
   mPreviewImage.SetParentOrigin( ParentOrigin::CENTER );
   mPreviewImage.SetAnchorPoint( AnchorPoint::CENTER );
-
-  if( !previewPath )
-  {
-    mPreviewImage.SetSize( mWidth, mHeight );
-  }
+  mPreviewImage.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
 
   Self().SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS );
   Self().SetSize( mWidth, mHeight );
 
-  Self().Add( mPreviewImage );
+  Self().Add( mPreviewActor );
+  mPreviewActor.Add( mPreviewImage );
+
+  mStateTextActor = Dali::Actor::New();
+  mStateTextActor.SetParentOrigin( ParentOrigin::CENTER );
+  mStateTextActor.SetAnchorPoint( AnchorPoint::CENTER );
+  mStateTextActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
 
   // State text
   // TODO: use po files
   mStateText = Toolkit::TextLabel::New( "Loading..." );
-
   mStateText.SetParentOrigin( ParentOrigin::CENTER );
   mStateText.SetAnchorPoint( AnchorPoint::CENTER );
   mStateText.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
   mStateText.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
 
-  mPreviewImage.Add( mStateText );
+  mPreviewActor.Add( mStateTextActor );
+  mStateTextActor.Add( mStateText );
 
   // launch widget
   mPid = widget_instance_launch( instanceId, (char *)mContentInfo.c_str(), mWidth, mHeight );

diff --git a/internal/widget_view/widget_view_impl.h b/internal/widget_view/widget_view_impl.h
index 006bdee..3d3079d 100644 (file)
--- a/internal/widget_view/widget_view_impl.h
+++ b/internal/widget_view/widget_view_impl.h
@@ -242,6 +242,8 @@ private:
   Toolkit::ImageView mWidgetImageView;     ///< Widget content
   Toolkit::ImageView mPreviewImage;   ///< Preview image
   Toolkit::TextLabel mStateText;      ///< State text
+  Dali::Actor mPreviewActor;
+  Dali::Actor mStateTextActor;
   Dali::NativeImageSourcePtr mImageSource;
 
   std::string mWidgetId;