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=5e520d87832b071686dad7f165d2dc632a9697f5;hp=03229f9e9ca17840e82aaa17e39b000fa18ab304;hb=108a91b70f76ed395aaff1694010c56f3d1a653c;hpb=7e315e8b217ab571598d8db28df867a5da0b99d7 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 03229f9..5e520d8 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -1,4 +1,19 @@ -// Copyright (c) 2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // CLASS HEADER #include "image-view-impl.h" @@ -11,7 +26,12 @@ // INTERNAL INCLUDES #include -#include +#include +#include +#include +#include +#include +#include namespace Dali { @@ -44,7 +64,8 @@ DALI_TYPE_REGISTRATION_END() using namespace Dali; ImageView::ImageView() -: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ) +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), + mImageSize() { } @@ -67,78 +88,119 @@ Toolkit::ImageView ImageView::New() ///////////////////////////////////////////////////////////// +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() ); + handle.ResourceReadySignal().Connect( this, &ImageView::OnResourceReady ); +} + void ImageView::SetImage( Image image ) { - if( ( mImage != image ) || - ! mUrl.empty() || // If we're changing from a URL type to an Image type - ! mPropertyMap.Empty() ) // If we're changing from a property map type to an Image type + // Don't bother comparing if we had a visual previously, just drop old visual and create new one + mImage = image; + mUrl.clear(); + mPropertyMap.Clear(); + + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( image ); + if( visual ) { - mUrl.clear(); - mPropertyMap.Clear(); + if( !mVisual ) + { + mVisual = visual; + } - mImage = image; + if( !mShaderMap.Empty() ) + { + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + visualImpl.SetCustomShader( mShaderMap ); + } - Actor self = Self(); - Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, image ); - mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 ); + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); + } + else + { + // Unregister the exsiting visual + DevelControl::UnregisterVisual( *this, Toolkit::ImageView::Property::IMAGE ); + // Trigger a size negotiation request that may be needed when unregistering a visual. RelayoutRequest(); } + + Toolkit::DevelControl::RequestLayout( *this ); } -void ImageView::SetImage( Property::Map map ) +void ImageView::SetImage( const Property::Map& map ) { + // Comparing a property map is too expensive so just creating a new visual + mPropertyMap = map; mUrl.clear(); mImage.Reset(); - mPropertyMap = map; - Actor self = Self(); - Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mPropertyMap ); - - Property::Value* widthValue = mPropertyMap.Find( "width" ); - if( widthValue ) + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap ); + if( visual ) { - int width; - if( widthValue->Get( width ) ) + // Don't set mVisual until it is ready and shown. Getters will still use current visual. + if( !mVisual ) { - mImageSize = ImageDimensions( width, mImageSize.GetHeight() ); + mVisual = visual; } - } - Property::Value* heightValue = mPropertyMap.Find( "height" ); - if( heightValue ) - { - int height; - if( heightValue->Get( height ) ) + if( !mShaderMap.Empty() ) { - mImageSize = ImageDimensions( mImageSize.GetWidth(), height ); + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + visualImpl.SetCustomShader( mShaderMap ); } + + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); + } + else + { + // Unregister the exsiting visual + DevelControl::UnregisterVisual( *this, Toolkit::ImageView::Property::IMAGE ); + + // Trigger a size negotiation request that may be needed when unregistering a visual. + RelayoutRequest(); } - RelayoutRequest(); + Toolkit::DevelControl::RequestLayout( *this ); } void ImageView::SetImage( const std::string& url, ImageDimensions size ) { - if( ( mUrl != url ) || - mImage || // If we're changing from an Image type to a URL type - ! mPropertyMap.Empty() ) // If we're changing from a property map type to a URL type - { - mImage.Reset(); - mPropertyMap.Clear(); + // Don't bother comparing if we had a visual previously, just drop old visual and create new one + mUrl = url; + mImageSize = size; + mImage.Reset(); + mPropertyMap.Clear(); - mUrl = url; + // 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( visual ) + { + if( !mVisual ) + { + mVisual = visual; + } - if( size.GetWidth() != 0u && size.GetHeight() != 0u ) + if( !mShaderMap.Empty() ) { - mImageSize = size; + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + visualImpl.SetCustomShader( mShaderMap ); } - Actor self = Self(); - Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl, size ); + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); + } + else + { + // Unregister the exsiting visual + DevelControl::UnregisterVisual( *this, Toolkit::ImageView::Property::IMAGE ); + // Trigger a size negotiation request that may be needed when unregistering a visual. RelayoutRequest(); } + + Toolkit::DevelControl::RequestLayout( *this ); } Image ImageView::GetImage() const @@ -148,117 +210,143 @@ Image ImageView::GetImage() const void ImageView::EnablePreMultipliedAlpha( bool preMultipled ) { - if( mRenderer ) + if( mVisual ) { - GetImplementation( mRenderer ).EnablePreMultipliedAlpha( preMultipled ); + Toolkit::GetImplementation( mVisual ).EnablePreMultipliedAlpha( preMultipled ); } } bool ImageView::IsPreMultipliedAlphaEnabled() const { - if( mRenderer ) + if( mVisual ) { - return GetImplementation( mRenderer ).IsPreMultipliedAlphaEnabled(); + return Toolkit::GetImplementation( mVisual ).IsPreMultipliedAlphaEnabled(); } return false; } void ImageView::SetDepthIndex( int depthIndex ) { - if( mRenderer ) + if( mVisual ) { - mRenderer.SetDepthIndex( depthIndex ); + mVisual.SetDepthIndex( depthIndex ); } } Vector3 ImageView::GetNaturalSize() { - if( mRenderer ) + if( mVisual ) { Vector2 rendererNaturalSize; - mRenderer.GetNaturalSize( rendererNaturalSize ); - return Vector3( rendererNaturalSize ); - } + mVisual.GetNaturalSize( rendererNaturalSize ); - Vector3 size; - size.x = mImageSize.GetWidth(); - size.y = mImageSize.GetHeight(); + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); - if( size.x > 0 && size.y > 0 ) - { - size.z = std::min(size.x, size.y); - return size; - } - else - { - // if no image then use Control's natural size - return Control::GetNaturalSize(); + rendererNaturalSize.width += ( padding.start + padding.end ); + rendererNaturalSize.height += ( padding.top + padding.bottom ); + return Vector3( rendererNaturalSize ); } + + // if no visual then use Control's natural size + return Control::GetNaturalSize(); } float ImageView::GetHeightForWidth( float width ) { - if( mImageSize.GetWidth() > 0 && mImageSize.GetHeight() > 0 ) + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + + if( mVisual ) { - return GetHeightForWidthBase( 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 ) { - if( mImageSize.GetWidth() > 0 && mImageSize.GetHeight() > 0 ) + Extents padding; + padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + + if( mVisual ) { - return GetWidthForHeightBase( height ); + return mVisual.GetWidthForHeight( height ) + padding.start + padding.end; } else { - return Control::GetWidthForHeight( height ); + return Control::GetWidthForHeight( height ) + padding.start + padding.end; } } - -/////////////////////////////////////////////////////////// -// -// Private methods -// - -void ImageView::OnStageConnection( int depth ) +void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) { - Control::OnStageConnection( depth ); + Control::OnRelayout( size, container ); - if( mRenderer ) + if( mVisual ) { - CustomActor self = Self(); - mRenderer.SetOnStage( self ); - } -} + Property::Map transformMap = Property::Map(); -void ImageView::OnStageDisconnection() -{ - if( mRenderer ) - { - CustomActor self = Self(); - mRenderer.SetOffStage( self ); - } + Extents padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + const Visual::FittingMode fittingMode = Toolkit::GetImplementation(mVisual).GetFittingMode(); - Control::OnStageDisconnection(); -} + if( ( padding != Extents() ) || // If padding is not zero + ( fittingMode == Visual::FittingMode::FIT_KEEP_ASPECT_RATIO ) ) + { + Dali::LayoutDirection::Type layoutDirection = static_cast( + Self().GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get() ); -void ImageView::OnSizeSet( const Vector3& targetSize ) -{ - Control::OnSizeSet( targetSize ); + if( Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection ) + { + std::swap( padding.start, padding.end ); + } - if( mRenderer ) - { - Vector2 size( targetSize ); - mRenderer.SetSize( size ); + auto finalOffset = Vector2( padding.start, padding.top ); + + // remove padding from the size to know how much is left for the visual + 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( fittingMode == Visual::FittingMode::FIT_KEEP_ASPECT_RATIO ) + { + auto availableVisualSize = finalSize; + + Vector2 naturalSize; + mVisual.GetNaturalSize( naturalSize ); + + // 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 + finalOffset += ( availableVisualSize - 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 ) ); + } + + mVisual.SetTransformAndSize( transformMap, size ); } } +void ImageView::OnResourceReady( Toolkit::Control control ) +{ + // 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 ); + Toolkit::DevelControl::RequestLayout( *this ); +} + /////////////////////////////////////////////////////////// // // Properties @@ -270,6 +358,7 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr if ( imageView ) { + ImageView& impl = GetImpl( imageView ); switch ( index ) { case Toolkit::ImageView::Property::RESOURCE_URL: @@ -277,7 +366,7 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr std::string imageUrl; if( value.Get( imageUrl ) ) { - GetImpl( imageView ).SetImage( imageUrl, ImageDimensions() ); + impl.SetImage( imageUrl, ImageDimensions() ); } break; } @@ -285,20 +374,43 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr case Toolkit::ImageView::Property::IMAGE: { std::string imageUrl; + Property::Map* map; if( value.Get( imageUrl ) ) { - ImageView& impl = GetImpl( imageView ); impl.SetImage( imageUrl, ImageDimensions() ); } - // if its not a string then get a Property::Map from the property if possible. - Property::Map map; - if( value.Get( map ) ) + else { - ImageView& impl = GetImpl( imageView ); - impl.SetImage( map ); + map = value.GetMap(); + if( map ) + { + 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 ) + { + impl.SetImage( *map ); + } + // the property map contains only the custom shader + else if( ( map->Count() == 1u )&&( shaderValue ) ) + { + impl.mShaderMap = *( shaderValue->GetMap() ); + + if( !impl.mUrl.empty() ) + { + impl.SetImage( impl.mUrl, impl.mImageSize ); + } + else if( impl.mImage ) + { + impl.SetImage( impl.mImage ); + } + else if( !impl.mPropertyMap.Empty() ) + { + impl.SetImage( impl.mPropertyMap ); + } + } + } } - break; } @@ -307,7 +419,7 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr bool isPre; if( value.Get( isPre ) ) { - GetImpl(imageView).EnablePreMultipliedAlpha( isPre ); + impl.EnablePreMultipliedAlpha( isPre ); } break; }