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=4183b89470948873a3b3acbaf6cff0e6067e8ddf;hp=e50e9611a3d685d11c6eceb1814d146fdf3adfd7;hb=b977f2ca75522fc2eb536eef07f1180ec4377589;hpb=41278d3fb755de3cb89edf6d80603b18562b4e01 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 e50e961..4183b89 100644 --- 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) 2017 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,8 +64,7 @@ DALI_TYPE_REGISTRATION_END() using namespace Dali; ImageView::ImageView() -: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), - mPremultipledAlphaEnabled( false ) +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ) { } @@ -68,78 +87,60 @@ Toolkit::ImageView ImageView::New() ///////////////////////////////////////////////////////////// -void ImageView::SetImage( Image image ) +void ImageView::OnInitialize() { - 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 - { - mUrl.clear(); - mPropertyMap.Clear(); - - mImage = image; - - Actor self = Self(); - Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, image ); - mImageSize = image ? ImageDimensions( image.GetWidth(), image.GetHeight() ) : ImageDimensions( 0, 0 ); - - RelayoutRequest(); - } + // 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 ); } -void ImageView::SetImage( Property::Map map ) +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(); - mImage.Reset(); - mPropertyMap = map; - - Actor self = Self(); - Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mPropertyMap ); + mPropertyMap.Clear(); - Property::Value* widthValue = mPropertyMap.Find( "width" ); - if( widthValue ) + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( image ); + if (!mVisual) { - int width; - if( widthValue->Get( width ) ) - { - mImageSize = ImageDimensions( width, mImageSize.GetHeight() ); - } + mVisual = visual; } - Property::Value* heightValue = mPropertyMap.Find( "height" ); - if( heightValue ) + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); +} + +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(); + 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) { - int height; - if( heightValue->Get( height ) ) - { - mImageSize = ImageDimensions( mImageSize.GetWidth(), height ); - } + mVisual = visual; } - RelayoutRequest(); + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); } 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(); - - mUrl = url; - - if( size.GetWidth() != 0u && size.GetHeight() != 0u ) - { - mImageSize = size; - } - - Actor self = Self(); - Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl, size ); + // Don't bother comparing if we had a visual previously, just drop old visual and create new one + mUrl = url; + mImage.Reset(); + mPropertyMap.Clear(); - RelayoutRequest(); + // 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) + { + mVisual = visual; } + + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); } Image ImageView::GetImage() const @@ -149,59 +150,47 @@ 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 ); + mVisual.GetNaturalSize( rendererNaturalSize ); return Vector3( rendererNaturalSize ); } - Vector3 size; - size.x = mImageSize.GetWidth(); - size.y = mImageSize.GetHeight(); - - 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(); - } + // if no visual then use Control's natural size + return Control::GetNaturalSize(); } float ImageView::GetHeightForWidth( float width ) { - if( mImageSize.GetWidth() > 0 && mImageSize.GetHeight() > 0 ) + if( mVisual ) { - return GetHeightForWidthBase( width ); + return mVisual.GetHeightForWidth( width ); } else { @@ -211,9 +200,9 @@ float ImageView::GetHeightForWidth( float width ) float ImageView::GetWidthForHeight( float height ) { - if( mImageSize.GetWidth() > 0 && mImageSize.GetHeight() > 0 ) + if( mVisual ) { - return GetWidthForHeightBase( height ); + return mVisual.GetWidthForHeight( height ); } else { @@ -221,43 +210,23 @@ float ImageView::GetWidthForHeight( float height ) } } - -/////////////////////////////////////////////////////////// -// -// Private methods -// - -void ImageView::OnStageConnection( int depth ) +void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) { - Control::OnStageConnection( depth ); + Control::OnRelayout( size, container ); - if( mRenderer ) - { - CustomActor self = Self(); - mRenderer.SetOnStage( self ); - } -} + // If visual is being replaced then mVisual will be the replacement visual even if not ready. + mVisual = DevelControl::GetVisual( *this, Toolkit::ImageView::Property::IMAGE ); -void ImageView::OnStageDisconnection() -{ - if( mRenderer ) + if( mVisual ) { - CustomActor self = Self(); - mRenderer.SetOffStage( self ); + // Pass in an empty map which uses default transform values meaning our visual fills the control + // Should provide a transform that handles aspect ratio according to image size + mVisual.SetTransformAndSize( Property::Map(), size ); } - - Control::OnStageDisconnection(); } -void ImageView::OnSizeSet( const Vector3& targetSize ) +void ImageView::OnResourceReady( Toolkit::Control control ) { - Control::OnSizeSet( targetSize ); - - if( mRenderer ) - { - Vector2 size( targetSize ); - mRenderer.SetSize( size ); - } } /////////////////////////////////////////////////////////// @@ -271,6 +240,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: @@ -278,7 +248,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; } @@ -286,29 +256,50 @@ 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::DevelVisual::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( ( impl.mVisual )&&( map->Count() == 1u )&&( shaderValue ) ) + { + Property::Map* shaderMap = shaderValue->GetMap(); + if( shaderMap ) + { + Internal::Visual::Base& visual = Toolkit::GetImplementation( impl.mVisual ); + visual.SetCustomShader( *shaderMap ); + if( imageView.OnStage() ) + { + // force to create new core renderer to use the newly set shader + visual.SetOffStage( imageView ); + visual.SetOnStage( imageView ); + } + } + } + } } - break; } case Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA: { - bool IsPre; - if( value.Get( IsPre ) ) + bool isPre; + if( value.Get( isPre ) ) { - GetImpl(imageView).EnablePreMultipliedAlpha( IsPre ); + impl.EnablePreMultipliedAlpha( isPre ); } break; }