Removed deprecated use of SetImage( ResourceImage) from slider 90/115390/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 17 Feb 2017 15:41:31 +0000 (15:41 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 17 Feb 2017 15:41:31 +0000 (15:41 +0000)
Change-Id: Ia57d9e4fa2874a1beb0b6ed2a138e21fe3524e64

dali-toolkit/internal/controls/slider/slider-impl.cpp

index f32261891cb05846fd4f51fb47d999716a80951e..213818aa6673f4c3138ebb3d7c0edc0404ca776e 100755 (executable)
@@ -25,7 +25,7 @@
 #include <dali/public-api/events/touch-data.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/public-api/object/type-registry-helper.h>
-#include <dali/public-api/images/resource-image.h>
+#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/public-api/controls/control-impl.h>
@@ -520,8 +520,9 @@ void Slider::CreatePopupImage( const std::string& filename )
 {
   if( mPopup && ( filename.size() > 0 ) )
   {
-    Image image = ResourceImage::New( filename );
-    mPopup.SetImage( image );
+    Property::Map map;
+    map[Toolkit::ImageVisual::Property::URL] = filename;
+    mPopup.SetProperty( Toolkit::ImageView::Property::IMAGE, map );
   }
 }
 
@@ -557,8 +558,9 @@ void Slider::CreatePopupArrowImage( const std::string& filename )
 {
   if( mPopupArrow && ( filename.size() > 0 ) )
   {
-    Image image = ResourceImage::New( filename );
-    mPopupArrow.SetImage( image );
+    Property::Map map;
+    map[Toolkit::ImageVisual::Property::URL] = filename;
+    mPopupArrow.SetProperty( Toolkit::ImageView::Property::IMAGE, map );
   }
 }