X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=e01514489a314eed1f5a74a951c957eaffbf7904;hb=c684d99e0c75210ab867c48f080e4a1cf0b46781;hp=691f93280e3015413354b759e72de554c8b5265c;hpb=0266d4d16b2c7bcb80edab6dbfb4355aaab1cb17;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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 691f932..b2814a4 --- 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) 2019 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" @@ -6,13 +21,17 @@ // EXTERNAL INCLUDES #include #include -#include +#include #include // INTERNAL INCLUDES #include -#include -#include +#include +#include +#include +#include +#include +#include namespace Dali { @@ -33,7 +52,11 @@ BaseHandle Create() // Setup properties, signals and actions using the type-registry. DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ImageView, Toolkit::Control, Create ); +DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "resourceUrl", STRING, RESOURCE_URL ) DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "image", MAP, IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "preMultipliedAlpha", BOOLEAN, PRE_MULTIPLIED_ALPHA ) + +DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT( Toolkit, ImageView, "pixelArea", Vector4(0.f, 0.f, 1.f, 1.f), PIXEL_AREA ) DALI_TYPE_REGISTRATION_END() } // anonymous namespace @@ -41,7 +64,8 @@ DALI_TYPE_REGISTRATION_END() using namespace Dali; ImageView::ImageView() -: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ) +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), + mImageSize() { } @@ -64,178 +88,265 @@ Toolkit::ImageView ImageView::New() ///////////////////////////////////////////////////////////// -void ImageView::SetImage( Image image ) +void ImageView::OnInitialize() { - if( mImage != image ) - { - mUrl.clear(); - mPropertyMap.Clear(); + // 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 ); +} - mImage = image; +void ImageView::SetImage( Image image ) +{ + // Don't bother comparing if we had a visual previously, just drop old visual and create new one + mImage = image; + mUrl.clear(); + mPropertyMap.Clear(); - bool newRendererCreated = false; - if( mRenderer ) - { - newRendererCreated = Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, image ); - } - else + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( image ); + if( visual ) + { + if( !mVisual ) { - mRenderer = Toolkit::RendererFactory::Get().GetControlRenderer( image ); - newRendererCreated = true; + mVisual = visual; } - //we need to inform any newly created renderers if it is on stage - if( newRendererCreated && Self().OnStage() ) + if( !mShaderMap.Empty() ) { - CustomActor self = Self(); - mRenderer.SetOnStage( self ); + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + visualImpl.SetCustomShader( mShaderMap ); } - mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 ); + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); } + else + { + // Unregister the existing visual + DevelControl::UnregisterVisual( *this, Toolkit::ImageView::Property::IMAGE ); + + // Trigger a size negotiation request that may be needed when unregistering a visual. + RelayoutRequest(); + } + + // Signal that a Relayout may be needed } -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(); - bool newRendererCreated = false; - if( mRenderer ) + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap ); + if( visual ) { - newRendererCreated = Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, mPropertyMap ); - } - else - { - mRenderer = Toolkit::RendererFactory::Get().GetControlRenderer( mPropertyMap ); - newRendererCreated = true; - } + // Don't set mVisual until it is ready and shown. Getters will still use current visual. + if( !mVisual ) + { + mVisual = visual; + } - //we need to inform any newly created renderers if it is on stage - CustomActor self = Self(); - if( newRendererCreated && self.OnStage() ) - { - mRenderer.SetOnStage( self ); - } + if( !mShaderMap.Empty() ) + { + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + visualImpl.SetCustomShader( mShaderMap ); + } - int width = 0; - Property::Value* widthValue = mPropertyMap.Find( "width" ); - if( widthValue ) - { - widthValue->Get( width ); + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); } - - int height = 0; - Property::Value* heightValue = mPropertyMap.Find( "height" ); - if( heightValue ) + else { - heightValue->Get( height ); + // 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(); } - mImageSize = ImageDimensions( width, height ); + // Signal that a Relayout may be needed } -void ImageView::SetImage( const std::string& url ) +void ImageView::SetImage( const std::string& url, ImageDimensions size ) { - if( mUrl != url ) + // 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(); + + // 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 ) { - mImage.Reset(); - mPropertyMap.Clear(); - - mUrl = url; - - bool newRendererCreated = false; - if( mRenderer ) - { - newRendererCreated = Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, mUrl ); - } - else + if( !mVisual ) { - mRenderer = Toolkit::RendererFactory::Get().GetControlRenderer( mUrl ); - newRendererCreated = true; + mVisual = visual; } - //we need to inform any newly created renderers if it is on stage - if( newRendererCreated && Self().OnStage() ) + if( !mShaderMap.Empty() ) { - CustomActor self = Self(); - mRenderer.SetOnStage( self ); + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + visualImpl.SetCustomShader( mShaderMap ); } - mImageSize = ResourceImage::GetImageSize( mUrl ); + 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(); } + + // Signal that a Relayout may be needed } -Vector3 ImageView::GetNaturalSize() +Image ImageView::GetImage() const { - Vector3 size; + return mImage; +} + +void ImageView::EnablePreMultipliedAlpha( bool preMultipled ) +{ + if( mVisual ) + { + Toolkit::GetImplementation( mVisual ).EnablePreMultipliedAlpha( preMultipled ); + } +} - size.x = mImageSize.GetWidth(); - size.y = mImageSize.GetHeight(); - size.z = std::min(size.x, size.y); +bool ImageView::IsPreMultipliedAlphaEnabled() const +{ + if( mVisual ) + { + return Toolkit::GetImplementation( mVisual ).IsPreMultipliedAlphaEnabled(); + } + return false; +} - if( size.x > 0 && size.x > 0 ) +void ImageView::SetDepthIndex( int depthIndex ) +{ + if( mVisual ) { - return size; + mVisual.SetDepthIndex( depthIndex ); } - else +} + +Vector3 ImageView::GetNaturalSize() +{ + if( mVisual ) { - // if no image then use Control's natural size - return Control::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 ); } + + // 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(); + + Extents padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + const Visual::FittingMode fittingMode = Toolkit::GetImplementation(mVisual).GetFittingMode(); + + 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() ); + + if( Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection ) + { + std::swap( padding.start, padding.end ); + } + + 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::OnStageDisconnection() +void ImageView::OnResourceReady( Toolkit::Control control ) { - if( mRenderer ) - { - CustomActor self = Self(); - mRenderer.SetOffStage( self ); - } - - Control::OnStageDisconnection(); + // 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 ); + // Signal that a Relayout may be needed } - /////////////////////////////////////////////////////////// // // Properties @@ -247,25 +358,73 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr if ( imageView ) { + ImageView& impl = GetImpl( imageView ); switch ( index ) { - case Toolkit::ImageView::Property::IMAGE: + case Toolkit::ImageView::Property::RESOURCE_URL: { std::string imageUrl; if( value.Get( imageUrl ) ) { - ImageView& impl = GetImpl( imageView ); - impl.SetImage( imageUrl ); + impl.SetImage( imageUrl, ImageDimensions() ); } + break; + } + case Toolkit::ImageView::Property::IMAGE: + { + std::string imageUrl; + Property::Map* map; + if( value.Get( imageUrl ) ) + { + 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 ) ) + { + Property::Map* shaderMap = shaderValue->GetMap(); + if( shaderMap ) + { + impl.mShaderMap = *shaderMap; + + 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; + } + case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA: + { + bool isPre; + if( value.Get( isPre ) ) + { + impl.EnablePreMultipliedAlpha( isPre ); + } break; } } @@ -280,11 +439,20 @@ Property::Value ImageView::GetProperty( BaseObject* object, Property::Index prop if ( imageview ) { + ImageView& impl = GetImpl( imageview ); switch ( propertyIndex ) { + case Toolkit::ImageView::Property::RESOURCE_URL: + { + if ( !impl.mUrl.empty() ) + { + value = impl.mUrl; + } + break; + } + case Toolkit::ImageView::Property::IMAGE: { - ImageView& impl = GetImpl( imageview ); if ( !impl.mUrl.empty() ) { value = impl.mUrl; @@ -295,12 +463,24 @@ Property::Value ImageView::GetProperty( BaseObject* object, Property::Index prop Scripting::CreatePropertyMap( impl.mImage, map ); value = map; } - else if( !impl.mPropertyMap.Empty() ) + else { - value = impl.mPropertyMap; + Property::Map map; + Toolkit::Visual::Base visual = DevelControl::GetVisual( impl, Toolkit::ImageView::Property::IMAGE ); + if( visual ) + { + visual.CreatePropertyMap( map ); + } + value = map; } break; } + + case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA: + { + value = impl.IsPreMultipliedAlphaEnabled(); + break; + } } }