From 9e9fcd37ec9a11c32868e464642c7c42a5e4e1ba Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Mon, 14 Aug 2017 15:36:00 +0900 Subject: [PATCH] Revert "[Tizen] Ensure ImageView updates mVisual once ready/loaded" This reverts commit c0c8dbbdb61e49c472bea1640bdb3178b3f98853. Change-Id: I1eb3812eeba24e0dc53ffca7aa488377c5db54aa --- dali-toolkit/internal/controls/image-view/image-view-impl.cpp | 6 ------ 1 file changed, 6 deletions(-) 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 ddf0e2e..fabcf19 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp @@ -117,8 +117,6 @@ void ImageView::SetImage( const Property::Map& map ) mPropertyMap = map; mUrl.clear(); mImage.Reset(); - mRelayoutRequired = true; - 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) @@ -135,7 +133,6 @@ void ImageView::SetImage( const std::string& url, ImageDimensions size ) mUrl = url; mImage.Reset(); mPropertyMap.Clear(); - mRelayoutRequired = true; // 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 ); @@ -247,9 +244,6 @@ void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container ) 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 ); - if( mRelayoutRequired) { mRelayoutRequired = false; -- 2.7.4