Revert "[4.0] Change FittingMode on Item view demos."

This reverts commit afeec33556b7136c0cfc39132bcb25d67c5cb48e.

Change-Id: If39d60aaf45f5e7f135804e9ff0605147fff8a28

diff --git a/examples/clipping/clipping-item-factory.cpp b/examples/clipping/clipping-item-factory.cpp
index f6cf377..1233831 100644 (file)
--- a/examples/clipping/clipping-item-factory.cpp
+++ b/examples/clipping/clipping-item-factory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,6 @@
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 #include <dali-toolkit/public-api/visuals/border-visual-properties.h>
 #include <dali-toolkit/public-api/visuals/visual-properties.h>
-#include <dali-toolkit/public-api/visuals/image-visual-properties.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -104,12 +102,7 @@ unsigned int ClippingItemFactory::GetNumberOfItems()
 Actor ClippingItemFactory::NewItem( unsigned int itemId )
 {
   // Create an image view for this item
-  Property::Map propertyMap;
-  propertyMap.Insert(Visual::Property::TYPE,  Visual::IMAGE);
-  propertyMap.Insert(ImageVisual::Property::URL, IMAGE_PATHS[ itemId % NUM_IMAGES ] );
-  propertyMap.Insert(DevelVisual::Property::FITTING_MODE, DevelVisual::FILL);
-  ImageView actor = ImageView::New();
-  actor.SetProperty(Toolkit::ImageView::Property::IMAGE, propertyMap);
+  ImageView actor = ImageView::New( IMAGE_PATHS[ itemId % NUM_IMAGES ] );
 
   // Add a border image child actor
   ImageView borderActor = ImageView::New();

diff --git a/examples/item-view/item-view-example.cpp b/examples/item-view/item-view-example.cpp
index 61dce2d..d7e7b9b 100644 (file)
--- a/examples/item-view/item-view-example.cpp
+++ b/examples/item-view/item-view-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
-#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -867,12 +866,7 @@ public: // From ItemFactory
   virtual Actor NewItem(unsigned int itemId)
   {
     // Create an image view for this item
-    Property::Map propertyMap;
-    propertyMap.Insert(Toolkit::Visual::Property::TYPE,  Visual::IMAGE);
-    propertyMap.Insert(ImageVisual::Property::URL, IMAGE_PATHS[ itemId % NUM_IMAGES ] );
-    propertyMap.Insert(DevelVisual::Property::FITTING_MODE, DevelVisual::FILL);
-    ImageView actor = ImageView::New();
-    actor.SetProperty( Toolkit::ImageView::Property::IMAGE, propertyMap );
+    ImageView actor = ImageView::New( IMAGE_PATHS[ itemId % NUM_IMAGES ] );
     actor.SetZ( 0.0f );
     actor.SetPosition( INITIAL_OFFSCREEN_POSITION );