Peter M. Groen / dali-demo

Commit 230f97ccae55adad541c06b390aa0a2a3edee1ae

Authored by Kimmo Hoikka
Committed by Gerrit Code Review
2 parents 3807430c e50543aa

Merge "Another change to Image Scaling Irregular Grid example to not use depreca… 

…ted ImageView::GetImage method." into devel/master
Inline Side-by-side
Showing 1 changed file with 6 additions and 5 deletions
examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp
  View file @230f97c
... ... @@ -538,13 +538,14 @@ public:
538 538 if( gridImageView )
539 539 {
540 540 // Cycle the scaling mode options:
541   - const Vector2 imageSize = mSizes[gridImageView.GetId()];
542   - Dali::FittingMode::Type newMode = NextMode( mFittingModes[gridImageView.GetId()] );
543   - Image oldImage = gridImageView.GetImage();
544   - Image newImage = CreateImage(ResourceImage::DownCast(oldImage).GetUrl(), imageSize.width, imageSize.height, newMode );
  541 + unsigned int id = gridImageView.GetId();
  542 +
  543 + const Vector2 imageSize = mSizes[ id ];
  544 + Dali::FittingMode::Type newMode = NextMode( mFittingModes[ id ] );
  545 + Image newImage = CreateImage( mResourceUrls[ id ], imageSize.width, imageSize.height, newMode );
545 546 gridImageView.SetImage( newImage );
546 547  
547   - mFittingModes[gridImageView.GetId()] = newMode;
  548 + mFittingModes[ id ] = newMode;
548 549  
549 550 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" ) );
550 551 }
... ...