From a2dc91f8773430885832599ca5ff6915b34c4f0e Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Mon, 12 Mar 2018 15:46:30 +0900 Subject: [PATCH] Revert "Don't set position or offset on image visuals with fitting mode FILL" This reverts commit c40cf93a02e67215d4853278deb88f13d5c65003. Change-Id: I9ea07fc7e13bc93b7002033ba1bfefc3f83d9750 --- .../controls/image-view/image-view-impl.cpp | 60 +++++++++++----------- 1 file changed, 29 insertions(+), 31 deletions(-) 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 8bfa80d..84d6378 100755 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -278,46 +278,44 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) if( mVisual ) { - Property::Map transformMap = Property::Map(); + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); - // Don't transform if fitting mode is FILL - if(Toolkit::GetImplementation(mVisual).GetFittingMode() == Visual::FittingMode::FIT_KEEP_ASPECT_RATIO) - { - Extents padding; - padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + Dali::LayoutDirection::Type layoutDirection = static_cast( + Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get()); - Dali::LayoutDirection::Type layoutDirection = static_cast( - Self().GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get()); + if (Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection) + { + std::swap(padding.start, padding.end); + } - if (Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection) - { - 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); - // 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); - 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 - auto finalSize = - 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; - // 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(); - // 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)); + 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 ); } -- 2.7.4