Don't set position or offset on image visuals with fitting mode FILL

Change-Id: Id23268884f5a3587d5fb27132f03e2d19f70cb6d

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 7e1b7056f02e7571ba8617f6a6f3fa606c4450dd..9af610b60ec84d6f931c5ccf0668d495e59db407 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,44 +262,46 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container )
 
   if( mVisual )
   {
-    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>());
+    Property::Map transformMap = Property::Map();
 
-    if (Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection)
+    // Don't transform if fitting mode is FILL
+    if(Toolkit::GetImplementation(mVisual).GetFittingMode() == Visual::FittingMode::FIT_KEEP_ASPECT_RATIO)
     {
-      std::swap(padding.start, padding.end);
-    }
+      Extents padding;
+      padding = Self().GetProperty<Extents>( Toolkit::Control::Property::PADDING );
 
-    // 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);
+      Dali::LayoutDirection::Type layoutDirection = static_cast<Dali::LayoutDirection::Type>(
+              Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
 
-    Vector2 naturalSize;
-    mVisual.GetNaturalSize(naturalSize);
+      if (Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection)
+      {
+        std::swap(padding.start, padding.end);
+      }
 
-    // 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));
+      // 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);
 
-    // calculate final offset within the padded area
-    auto finalOffset = Vector2(padding.start, padding.top) + (paddedSize - finalSize) * .5f;
+      Vector2 naturalSize;
+      mVisual.GetNaturalSize(naturalSize);
 
-    // populate the transform map
-    Property::Map transformMap = Property::Map();
+      // scale to fit the padded area
+      auto finalSize =
+             naturalSize * std::min((paddedSize.width / naturalSize.width), (paddedSize.height / naturalSize.height));
 
-    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));
+      // calculate final offset within the padded area
+      auto finalOffset = Vector2(padding.start, padding.top) + (paddedSize - finalSize) * .5f;
 
+      // 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 );
   }