From e50543aab3fe1a5723f64bbc70c1a8e85981379b Mon Sep 17 00:00:00 2001 From: Chu Hoang Date: Wed, 23 Sep 2015 14:40:26 +0100 Subject: [PATCH] Another change to Image Scaling Irregular Grid example to not use deprecated ImageView::GetImage method. Change-Id: I9d1ff6792eb7b664c9453f2f25ee5cc180754268 --- .../image-scaling-irregular-grid-example.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp index efac586..e8642d0 100644 --- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp +++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp @@ -538,13 +538,14 @@ public: if( gridImageView ) { // Cycle the scaling mode options: - const Vector2 imageSize = mSizes[gridImageView.GetId()]; - Dali::FittingMode::Type newMode = NextMode( mFittingModes[gridImageView.GetId()] ); - Image oldImage = gridImageView.GetImage(); - Image newImage = CreateImage(ResourceImage::DownCast(oldImage).GetUrl(), imageSize.width, imageSize.height, newMode ); + unsigned int id = gridImageView.GetId(); + + const Vector2 imageSize = mSizes[ id ]; + Dali::FittingMode::Type newMode = NextMode( mFittingModes[ id ] ); + Image newImage = CreateImage( mResourceUrls[ id ], imageSize.width, imageSize.height, newMode ); gridImageView.SetImage( newImage ); - mFittingModes[gridImageView.GetId()] = newMode; + mFittingModes[ id ] = newMode; SetTitle( std::string( newMode == FittingMode::SHRINK_TO_FIT ? "SHRINK_TO_FIT" : newMode == FittingMode::SCALE_TO_FILL ? "SCALE_TO_FILL" : newMode == FittingMode::FIT_WIDTH ? "FIT_WIDTH" : "FIT_HEIGHT" ) ); } -- 2.7.4