Fix ImageView Padding and Margin issues

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / image-view / image-view-impl.cpp

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..720ef21 100755 (executable)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -262,45 +262,49 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container )
 
   if( mVisual )
   {
-    Extents padding;
-    padding = Self().GetProperty<Extents>( Toolkit::Control::Property::PADDING );
+    Property::Map transformMap = Property::Map();
+
+    Extents 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 );
     }
 
+    auto finalOffset = Vector2( padding.start, padding.top );
+
     // 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 finalSize = size - Vector2( padding.start + padding.end, padding.top + padding.bottom );
+
+    // Should provide a transform that handles aspect ratio according to image size
+    if( Toolkit::GetImplementation(mVisual).GetFittingMode() == Visual::FittingMode::FIT_KEEP_ASPECT_RATIO )
+    {
+      auto availableVisualSize = finalSize;
 
-    Vector2 naturalSize;
-    mVisual.GetNaturalSize(naturalSize);
+      Vector2 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));
+      // scale to fit the padded area
+      finalSize = naturalSize * std::min( ( naturalSize.width  ? ( availableVisualSize.width  / naturalSize.width  ) : 0 ),
+                                          ( naturalSize.height ? ( availableVisualSize.height / naturalSize.height ) : 0 ) );
 
-    // calculate final offset within the padded area
-    auto finalOffset = Vector2(padding.start, padding.top) + (paddedSize - finalSize) * .5f;
+      // calculate final offset within the padded area
+      finalOffset += ( availableVisualSize - finalSize ) * .5f;
+    }
 
     // populate the transform map
-    Property::Map transformMap = Property::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));
+    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 );
   }
 }