X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=7e1b7056f02e7571ba8617f6a6f3fa606c4450dd;hp=835bb4ecb2cb96722f599bf85da437d0edfc9745;hb=6ee3158c2bb9ef4993947d65f520c00eca6edde3;hpb=3ea0c6dd8536cc1ebd948f47f569bc8f09547e27

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
old mode 100644
new mode 100755
index 835bb4e..7e1b705
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -265,16 +265,41 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container )
     Extents padding;
     padding = Self().GetProperty<Extents>( Toolkit::Control::Property::PADDING );
 
-    Property::Map transformMap = Property::Map();
+    Dali::LayoutDirection::Type layoutDirection = static_cast<Dali::LayoutDirection::Type>(
+            Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
 
-    if( ( padding.start != 0 ) || ( padding.end != 0 ) || ( padding.top != 0 ) || ( padding.bottom != 0 ) )
+    if (Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection)
     {
-      transformMap.Add( Toolkit::Visual::Transform::Property::OFFSET, Vector2( padding.start, padding.top ) )
-                  .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 );
+      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);
+
+    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));
+
+    // calculate final offset within the padded area
+    auto finalOffset = Vector2(padding.start, padding.top) + (paddedSize - 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));
+
     // Should provide a transform that handles aspect ratio according to image size
     mVisual.SetTransformAndSize( transformMap, size );
   }