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=890312c803272025106b97f837e088ac9df0dda4;hp=11d53894530218405bc873209a9b883a304774b9;hb=ffbedd6ff6f28896756b207fdf3430fe40e55ed1;hpb=e67e9b3d73584b1bf8274daf72fc925159011d46 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 11d5389..890312c 100755 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -64,7 +64,8 @@ DALI_TYPE_REGISTRATION_END() using namespace Dali; ImageView::ImageView() -: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ) +: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), + mImageSize() { } @@ -109,7 +110,13 @@ void ImageView::SetImage( Image image ) mVisual = visual; } - DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); + if( !mShaderMap.Empty() ) + { + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + visualImpl.SetCustomShader( mShaderMap ); + } + + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); } else { @@ -139,6 +146,12 @@ void ImageView::SetImage( const Property::Map& map ) mVisual = visual; } + if( !mShaderMap.Empty() ) + { + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + visualImpl.SetCustomShader( mShaderMap ); + } + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); } else @@ -157,6 +170,7 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size ) { // 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(); @@ -169,6 +183,12 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size ) mVisual = visual; } + if( !mShaderMap.Empty() ) + { + Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); + visualImpl.SetCustomShader( mShaderMap ); + } + DevelControl::RegisterVisual( *this, Toolkit::ImageView::Property::IMAGE, visual ); } else @@ -271,45 +291,50 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) Property::Map transformMap = Property::Map(); Extents padding = Self().GetProperty( Toolkit::Control::Property::PADDING ); + const Visual::FittingMode fittingMode = Toolkit::GetImplementation(mVisual).GetFittingMode(); - Dali::LayoutDirection::Type layoutDirection = static_cast( - Self().GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get() ); - - if( Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection ) + if( ( padding != Extents() ) || // If padding is not zero + ( fittingMode == Visual::FittingMode::FIT_KEEP_ASPECT_RATIO ) ) { - std::swap( padding.start, padding.end ); - } + Dali::LayoutDirection::Type layoutDirection = static_cast( + Self().GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get() ); - auto finalOffset = Vector2( padding.start, padding.top ); + 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 finalSize = size - Vector2( padding.start + padding.end, padding.top + padding.bottom ); + auto finalOffset = Vector2( padding.start, padding.top ); - // Should provide a transform that handles aspect ratio according to image size - if( Toolkit::GetImplementation(mVisual).GetFittingMode() == Visual::FittingMode::FIT_KEEP_ASPECT_RATIO ) - { - auto availableVisualSize = finalSize; + // 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 ); - Vector2 naturalSize; - mVisual.GetNaturalSize( naturalSize ); + // Should provide a transform that handles aspect ratio according to image size + if( fittingMode == Visual::FittingMode::FIT_KEEP_ASPECT_RATIO ) + { + auto availableVisualSize = finalSize; - // scale to fit the padded area - finalSize = naturalSize * std::min( ( naturalSize.width ? ( availableVisualSize.width / naturalSize.width ) : 0 ), - ( naturalSize.height ? ( availableVisualSize.height / naturalSize.height ) : 0 ) ); + Vector2 naturalSize; + mVisual.GetNaturalSize( naturalSize ); - // calculate final offset within the padded area - finalOffset += ( availableVisualSize - finalSize ) * .5f; - } + // scale to fit the padded area + finalSize = naturalSize * std::min( ( naturalSize.width ? ( availableVisualSize.width / naturalSize.width ) : 0 ), + ( naturalSize.height ? ( availableVisualSize.height / naturalSize.height ) : 0 ) ); - // 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 ) ); + // 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 ); } @@ -319,6 +344,7 @@ 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 ); } /////////////////////////////////////////////////////////// @@ -366,18 +392,24 @@ void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr impl.SetImage( *map ); } // the property map contains only the custom shader - else if( ( impl.mVisual )&&( map->Count() == 1u )&&( shaderValue ) ) + else if( ( 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() ) + 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() ) { - // force to create new core renderer to use the newly set shader - visual.SetOffStage( imageView ); - visual.SetOnStage( imageView ); + impl.SetImage( impl.mPropertyMap ); } } }