X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.h;h=3af21ce921432ccd0d18200dcb835375c59d638c;hp=e912e4cba83b15d927d1bb6a7c155a0980da81a7;hb=172678a60aceeb2a60e5d4e5a3c613f8f3c492a9;hpb=e80261307788b4656435c4dd964beff7c85e7e8c

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/dali-toolkit/internal/controls/image-view/image-view-impl.h
index e912e4c..3af21ce 100644
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h
@@ -19,9 +19,10 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/devel-api/rendering/renderer.h>
+#include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
+#include <dali-toolkit/internal/controls/renderers/image/image-renderer.h>
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/image-view/image-view.h>
 
@@ -49,6 +50,8 @@ class ImageView : public Control
    */
   virtual ~ImageView();
 
+
+
 public:
   /**
    * Create a new ImageView.
@@ -57,14 +60,22 @@ public:
   static Toolkit::ImageView New();
 
   /**
-   * @copydoc Dali::Toolkit::SetImage( Image image )
+   * @copydoc Dali::Toolkit::SetImage
    */
   void SetImage( Image image );
 
   /**
-   * @copydoc Dali::Toolkit::Image GetImage() const
+   * @brief Sets this ImageView from an Dali::Property::Map
+   *
+   * If the handle is empty, ImageView will display nothing
+   * @param[in] map The Dali::Property::Map to use for to display.
+   */
+  void SetImage( Dali::Property::Map map );
+
+  /**
+   * @copydoc Dali::Toolkit::SetImage
    */
-  Image GetImage() const;
+  void SetImage( const std::string& imageUrl );
 
   // Properties
   /**
@@ -86,11 +97,6 @@ public:
 private: // From Control
 
   /**
-   * @copydoc Toolkit::Control::OnRelayout()
-   */
-  virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
-
-  /**
    * @copydoc Toolkit::Control::OnStageConnect()
    */
   virtual void OnStageConnection( int depth );
@@ -119,13 +125,17 @@ private:
   void AttachImage();
 
 private:
+  // Undefined
+  ImageView( const ImageView& );
+  ImageView& operator=( const ImageView& );
+
+private:
+  Toolkit::ControlRenderer  mRenderer;
+  ImageDimensions  mImageSize;
 
-  Sampler mSampler;
-  Material mMaterial;
-  Geometry mMesh;
-  Renderer mRenderer;
-  Image mImage;
-  std::string mImageUrl;
+  std::string      mUrl;          ///< the url for the image if the image came from a URL, empty otherwise
+  Image            mImage;        ///< the Image if the image came from a Image, null otherwise
+  Property::Map    mPropertyMap;  ///< the Property::Map if the image came from a Property::Map, empty otherwise
 };
 
 } // namespace Internal