Merge "Change resize policy of favicon." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / web-view / web-view-impl.cpp

diff --git a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
index 78015c9..0cf97a4 100755 (executable)
--- a/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
+++ b/dali-toolkit/internal/controls/web-view/web-view-impl.cpp
@@ -205,7 +205,7 @@ Dali::Toolkit::ImageView& WebView::GetFavicon()
     Dali::PixelData pixelData = mWebEngine.GetFavicon();
     std::string url = Dali::Toolkit::Image::GenerateUrl( pixelData );
     mFaviconView = Dali::Toolkit::ImageView::New( url );
     Dali::PixelData pixelData = mWebEngine.GetFavicon();
     std::string url = Dali::Toolkit::Image::GenerateUrl( pixelData );
     mFaviconView = Dali::Toolkit::ImageView::New( url );

-    mFaviconView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+    mFaviconView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );

     mFaviconView.SetProperty( Dali::Actor::Property::SIZE, Vector2( pixelData.GetWidth(), pixelData.GetHeight() ) );
   }
   return mFaviconView;
     mFaviconView.SetProperty( Dali::Actor::Property::SIZE, Vector2( pixelData.GetWidth(), pixelData.GetHeight() ) );
   }
   return mFaviconView;