X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=529832f9f826b2b28e910f7002711da17040c3ec;hb=b4d349772a1e4efc51972233461c545de3c9463c;hp=7e1b7056f02e7571ba8617f6a6f3fa606c4450dd;hpb=a0a28eb90260b017d231b0a2ff993825405fd058;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 7e1b705..529832f 100755
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -207,6 +207,22 @@ void ImageView::SetDepthIndex( int depthIndex )
   }
 }
 
+void ImageView::OnStageConnection( int depth )
+{
+  if( mImage )
+  {
+    mImage.UploadedSignal().Emit( mImage );
+  }
+
+  Dali::ResourceImage resourceImage = Dali::ResourceImage::DownCast( mImage );
+  if( resourceImage )
+  {
+    resourceImage.LoadingFinishedSignal().Emit( resourceImage );
+  }
+
+  Control::OnStageConnection( depth ); // Enabled visuals will be put on stage
+}
+
 Vector3 ImageView::GetNaturalSize()
 {
   if( mVisual )
@@ -262,43 +278,53 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container )
 
   if( mVisual )
   {
+    Property::Map transformMap = Property::Map();
+
     Extents padding;
     padding = Self().GetProperty<Extents>( Toolkit::Control::Property::PADDING );
 
     Dali::LayoutDirection::Type layoutDirection = static_cast<Dali::LayoutDirection::Type>(
-            Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
+          Self().GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get<int>() );
 
-    if (Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection)
+    if( Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection )
     {
-      std::swap(padding.start, padding.end);
+      std::swap( padding.start, padding.end );
     }
 
     // remove padding from the size to know how much is left for the visual
-    auto paddedSize = size - Vector2(padding.start + padding.end, padding.top + padding.bottom);
+    auto paddedSize = size - Vector2( padding.start + padding.end, padding.top + padding.bottom );
 
     Vector2 naturalSize;
-    mVisual.GetNaturalSize(naturalSize);
+    mVisual.GetNaturalSize( naturalSize );
 
     // scale to fit the padded area
     auto finalSize =
-        Toolkit::GetImplementation(mVisual).GetFittingMode() == Visual::FittingMode::FILL
-            ? paddedSize
-            : naturalSize * std::min((paddedSize.width / naturalSize.width), (paddedSize.height / naturalSize.height));
+         naturalSize * std::min( ( naturalSize.width  ? ( paddedSize.width  / naturalSize.width  ) : 0 ),
+                                 ( naturalSize.height ? ( paddedSize.height / naturalSize.height ) : 0 ) );
 
     // calculate final offset within the padded area
-    auto finalOffset = Vector2(padding.start, padding.top) + (paddedSize - finalSize) * .5f;
+    auto finalOffset = Vector2( padding.start, padding.top ) + ( paddedSize - finalSize ) * .5f;
 
-    // populate the transform map
-    Property::Map transformMap = Property::Map();
+    // When set the margin on ImageView, the visual should be repositioned.
+    Extents margin = Self().GetProperty<Extents>( Toolkit::Control::Property::MARGIN );
+    if( ( margin.start != 0 ) || ( margin.end != 0 ) || ( margin.top != 0 ) || ( margin.bottom != 0 ) )
+    {
+      if( Self().GetCurrentAnchorPoint() != AnchorPoint::CENTER )
+      {
+        finalOffset.x += margin.start;
+        finalOffset.y += margin.top;
+      }
+    }
 
-    transformMap.Add(Toolkit::Visual::Transform::Property::OFFSET, finalOffset)
-        .Add(Toolkit::Visual::Transform::Property::OFFSET_POLICY,
-             Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE))
-        .Add(Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN)
-        .Add(Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::TOP_BEGIN)
-        .Add(Toolkit::Visual::Transform::Property::SIZE, finalSize)
-        .Add(Toolkit::Visual::Transform::Property::SIZE_POLICY,
-             Vector2(Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE));
+    // populate the transform map
+    transformMap.Add( Toolkit::Visual::Transform::Property::OFFSET, finalOffset )
+                .Add( Toolkit::Visual::Transform::Property::OFFSET_POLICY,
+                    Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) )
+                .Add( Toolkit::Visual::Transform::Property::ORIGIN, Toolkit::Align::TOP_BEGIN )
+                .Add( Toolkit::Visual::Transform::Property::ANCHOR_POINT, Toolkit::Align::TOP_BEGIN )
+                .Add( Toolkit::Visual::Transform::Property::SIZE, finalSize )
+                .Add( Toolkit::Visual::Transform::Property::SIZE_POLICY,
+                    Vector2( Toolkit::Visual::Transform::Policy::ABSOLUTE, Toolkit::Visual::Transform::Policy::ABSOLUTE ) );
 
     // Should provide a transform that handles aspect ratio according to image size
     mVisual.SetTransformAndSize( transformMap, size );