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=20869d342b700511dcb4d368cf136b833074fbf7;hp=793410958937fb0738f4587142c52a3a1c82f4f6;hb=c87446dd57403afc21d11544d162df31c00922ee;hpb=354a975a68a9989a45344f2a3d2827fcc716111f 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 7934109..20869d3 --- 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. @@ -27,7 +27,7 @@ // INTERNAL INCLUDES #include #include -#include +#include #include #include #include @@ -64,8 +64,7 @@ DALI_TYPE_REGISTRATION_END() using namespace Dali; ImageView::ImageView() -: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), - mRelayoutRequired(true) +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ) { } @@ -92,7 +91,7 @@ void ImageView::OnInitialize() { // ImageView can relayout in the OnImageReady, alternative to a signal would be to have a upcall from the Control to ImageView Dali::Toolkit::Control handle( GetOwner() ); - Toolkit::DevelControl::ResourceReadySignal( handle ).Connect( this, &ImageView::OnResourceReady ); + handle.ResourceReadySignal().Connect( this, &ImageView::OnResourceReady ); } void ImageView::SetImage( Image image ) @@ -103,12 +102,23 @@ void ImageView::SetImage( Image image ) mPropertyMap.Clear(); Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( image ); - if (!mVisual) + if( visual ) { - mVisual = visual; + if( !mVisual ) + { + mVisual = visual; + } + + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); } + else + { + // Unregister the exsiting visual + DevelControl::UnregisterVisual( *this, Toolkit::ImageView::Property::IMAGE ); - DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); + // Trigger a size negotiation request that may be needed when unregistering a visual. + RelayoutRequest(); + } } void ImageView::SetImage( const Property::Map& map ) @@ -117,14 +127,26 @@ void ImageView::SetImage( const Property::Map& map ) mPropertyMap = map; mUrl.clear(); mImage.Reset(); + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap ); - // Don't set mVisual until it is ready and shown. Getters will still use current visual. - if (!mVisual) + if( visual ) { - mVisual = visual; + // Don't set mVisual until it is ready and shown. Getters will still use current visual. + if( !mVisual ) + { + mVisual = visual; + } + + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); } + else + { + // Unregister the exsiting visual + DevelControl::UnregisterVisual( *this, Toolkit::ImageView::Property::IMAGE ); - DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); + // Trigger a size negotiation request that may be needed when unregistering a visual. + RelayoutRequest(); + } } void ImageView::SetImage( const std::string& url, ImageDimensions size ) @@ -136,12 +158,23 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size ) // Don't set mVisual until it is ready and shown. Getters will still use current visual. Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( url, size ); - if (!mVisual) + if( visual ) { - mVisual = visual; + if( !mVisual ) + { + mVisual = visual; + } + + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); } + else + { + // Unregister the exsiting visual + DevelControl::UnregisterVisual( *this, Toolkit::ImageView::Property::IMAGE ); - DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); + // Trigger a size negotiation request that may be needed when unregistering a visual. + RelayoutRequest(); + } } Image ImageView::GetImage() const @@ -180,6 +213,12 @@ Vector3 ImageView::GetNaturalSize() { Vector2 rendererNaturalSize; mVisual.GetNaturalSize( rendererNaturalSize ); + + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + + rendererNaturalSize.width += ( padding.start + padding.end ); + rendererNaturalSize.height += ( padding.top + padding.bottom ); return Vector3( rendererNaturalSize ); } @@ -189,25 +228,31 @@ Vector3 ImageView::GetNaturalSize() float ImageView::GetHeightForWidth( float width ) { + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + if( mVisual ) { - return mVisual.GetHeightForWidth( width ); + return mVisual.GetHeightForWidth( width ) + padding.top + padding.bottom; } else { - return Control::GetHeightForWidth( width ); + return Control::GetHeightForWidth( width ) + padding.top + padding.bottom; } } float ImageView::GetWidthForHeight( float height ) { + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + if( mVisual ) { - return mVisual.GetWidthForHeight( height ); + return mVisual.GetWidthForHeight( height ) + padding.start + padding.end; } else { - return Control::GetWidthForHeight( height ); + return Control::GetWidthForHeight( height ) + padding.start + padding.end; } } @@ -215,24 +260,58 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) { Control::OnRelayout( size, container ); - // If visual is being replaced then mVisual will be the replacement visual even if not ready. - mVisual = DevelControl::GetVisual( *this, Toolkit::ImageView::Property::IMAGE ); - if( mVisual ) { - // Pass in an empty map which uses default transform values meaning our visual fills the control + Property::Map transformMap = Property::Map(); + + // 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()); + + 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); + + Vector2 naturalSize; + mVisual.GetNaturalSize(naturalSize); + + // scale to fit the padded area + auto finalSize = + 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; + + // 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( Property::Map(), size ); + mVisual.SetTransformAndSize( transformMap, size ); } } void ImageView::OnResourceReady( Toolkit::Control control ) { - if( mRelayoutRequired) - { - mRelayoutRequired = false; - RelayoutRequest(); - } + // Visual ready so update visual attached to this ImageView, following call to RelayoutRequest will use this visual. + mVisual = DevelControl::GetVisual( *this, Toolkit::ImageView::Property::IMAGE ); } /////////////////////////////////////////////////////////// @@ -273,7 +352,7 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr map = value.GetMap(); if( map ) { - Property::Value* shaderValue = map->Find( Toolkit::DevelVisual::Property::SHADER, CUSTOM_SHADER ); + Property::Value* shaderValue = map->Find( Toolkit::Visual::Property::SHADER, CUSTOM_SHADER ); // set image only if property map contains image information other than custom shader if( map->Count() > 1u || !shaderValue ) {