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=f19f390211ac906df3ff37c37f12186ea90f8e9a;hb=c87446dd57403afc21d11544d162df31c00922ee;hpb=baeb5ad3a0b2b1535c48dfb25f3d7ace66cde857 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 f19f390..20869d3 --- 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) 2016 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,8 @@ // INTERNAL INCLUDES #include -#include +#include +#include #include #include #include @@ -43,19 +59,6 @@ DALI_PROPERTY_REGISTRATION( Toolkit, ImageView, "preMultipliedAlpha", BOOLEAN, P DALI_ANIMATABLE_PROPERTY_REGISTRATION_WITH_DEFAULT( Toolkit, ImageView, "pixelArea", Vector4(0.f, 0.f, 1.f, 1.f), PIXEL_AREA ) DALI_TYPE_REGISTRATION_END() - -void SetDefaultTransformMap( Property::Map& transformMap ) -{ - transformMap.Clear(); - transformMap - .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET, Vector2(0.0f, 0.0f) ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::SIZE, Vector2(1.0f, 1.0f) ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::ORIGIN, Toolkit::Align::CENTER ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::ANCHOR_POINT, Toolkit::Align::CENTER ) - .Add( Toolkit::Visual::DevelProperty::Transform::Property::OFFSET_SIZE_MODE, Vector4::ZERO ); - -} - } // anonymous namespace using namespace Dali; @@ -84,82 +87,92 @@ 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 - { - mUrl.clear(); - mPropertyMap.Clear(); + // Don't bother comparing if we had a visual previously, just drop old visual and create new one + mImage = image; + mUrl.clear(); + mPropertyMap.Clear(); - mImage = image; + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( image ); + if( visual ) + { + if( !mVisual ) + { + mVisual = visual; + } - mVisual = Toolkit::VisualFactory::Get().CreateVisual( image ); - RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); - 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(); } } -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; - mVisual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap ); - RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); - - 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 ) ) - { - mImageSize = ImageDimensions( mImageSize.GetWidth(), height ); - } + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); } + else + { + // Unregister the exsiting visual + DevelControl::UnregisterVisual( *this, Toolkit::ImageView::Property::IMAGE ); - RelayoutRequest(); + // Trigger a size negotiation request that may be needed when unregistering a visual. + RelayoutRequest(); + } } 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; + // Don't bother comparing if we had a visual previously, just drop old visual and create new one + mUrl = url; + mImage.Reset(); + mPropertyMap.Clear(); - if( size.GetWidth() != 0u && size.GetHeight() != 0u ) + // 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 ) { - mImageSize = size; + mVisual = visual; } - mVisual = Toolkit::VisualFactory::Get().CreateVisual( url, size ); - RegisterVisual( Toolkit::ImageView::Property::IMAGE, mVisual ); - - // This transform fills the control - // Should provide a transform that handles aspect ratio according to image size - Property::Map transformMap; - SetDefaultTransformMap( transformMap ); - mVisual.SetTransformAndSize( transformMap, mSizeSet ); + 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(); } } @@ -200,72 +213,107 @@ Vector3 ImageView::GetNaturalSize() { Vector2 rendererNaturalSize; mVisual.GetNaturalSize( rendererNaturalSize ); - return Vector3( 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::OnSizeSet( const Vector3& targetSize ) +void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) { - Control::OnSizeSet( targetSize ); - mSizeSet = targetSize; + Control::OnRelayout( size, container ); if( mVisual ) { - Vector2 size( targetSize ); + 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; - // This transform fills the control + // 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 - Property::Map transformMap; - SetDefaultTransformMap( transformMap ); 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 ); +} + /////////////////////////////////////////////////////////// // // Properties @@ -293,33 +341,37 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr case Toolkit::ImageView::Property::IMAGE: { std::string imageUrl; - Property::Map map; + 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. - else if( value.Get( map ) ) + else { - Property::Value* shaderValue = map.Find( Toolkit::VisualProperty::SHADER, CUSTOM_SHADER ); - // set image only if property map contains image information other than custom shader - if( map.Count() > 1u || !shaderValue ) + map = value.GetMap(); + if( map ) { - impl.SetImage( map ); - } - // the property map contains only the custom shader - else if( impl.mVisual && map.Count() == 1u && shaderValue ) - { - Property::Map shaderMap; - if( shaderValue->Get( shaderMap ) ) + 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( ( impl.mVisual )&&( map->Count() == 1u )&&( shaderValue ) ) { - Internal::Visual::Base& visual = Toolkit::GetImplementation( impl.mVisual ); - visual.SetCustomShader( shaderMap ); - if( imageView.OnStage() ) + Property::Map* shaderMap = shaderValue->GetMap(); + if( shaderMap ) { - // force to create new core renderer to use the newly set shader - visual.SetOffStage( imageView ); - visual.SetOnStage( imageView ); + 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 ); + } } } }