-#ifndef __DALI_TOOLKIT_IMAGE_VIEW_H__
-#define __DALI_TOOLKIT_IMAGE_VIEW_H__
+#ifndef DALI_TOOLKIT_IMAGE_VIEW_H
+#define DALI_TOOLKIT_IMAGE_VIEW_H
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
* ResouceReadySignal is done after the resource is set then signal will be missed.
*
* To protect against this, IsResourceReady() can be checked before connecting to ResourceReadySignal,
- * or the signal connection can be done before setting the resource"
+ * or the signal connection can be done before setting the resource.
*
* @code
* auto myImageView = ImageView::New( resourceUrl );
* OR Connect to signal before setting resource
*
* @code
- * auto myImageView = ImageView::New( resourceUrl );
+ * auto myImageView = ImageView::New();
* myImageView.ResourceReadySignal.Connect( .... )
* myImageView.SetProperty( ImageView::Property::IMAGE, resourceUrl );
* @endcode
* @SINCE_1_0.0
*
*/
-class DALI_IMPORT_API ImageView : public Control
+class DALI_TOOLKIT_API ImageView : public Control
{
public:
// Event side properties
/**
- * @DEPRECATED_1_1.16. Use IMAGE instead.
- * @brief name "resourceUrl", type string.
- * @SINCE_1_0.0
- */
- RESOURCE_URL = PROPERTY_START_INDEX,
-
- /**
* @brief name "image", type string if it is a url, map otherwise.
* @SINCE_1_0.0
*/
- IMAGE,
+ IMAGE = PROPERTY_START_INDEX,
/**
* @brief name "preMultipliedAlpha", type Boolean.
static ImageView New();
/**
- * @DEPRECATED_1_2_8, use New( const std::string& ) instead.
- *
- * @brief Creates an initialized ImageView from an Image instance.
- *
- * If the handle is empty, ImageView will not display anything.
- *
- * @SINCE_1_0.0
- * @param[in] image The Image instance to display
- * @return A handle to a newly allocated ImageView
- */
- static ImageView New( Image image ) DALI_DEPRECATED_API;
-
- /**
* @brief Creates an initialized ImageView from an URL to an image resource.
*
* If the string is empty, ImageView will not display anything.
ImageView( const ImageView& imageView );
/**
+ * @brief Move constructor
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ */
+ ImageView( ImageView&& rhs );
+
+ /**
* @brief Assignment operator.
*
* @SINCE_1_0.0
ImageView& operator=( const ImageView& imageView );
/**
+ * @brief Move assignment
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ * @return A reference to this
+ */
+ ImageView& operator=( ImageView&& rhs );
+
+ /**
* @brief Downcasts a handle to ImageView handle.
*
* If handle points to a ImageView, the downcast produces valid handle.
static ImageView DownCast( BaseHandle handle );
/**
- * @DEPRECATED_1_2_8, use SetImage( const std::string& ) instead.
- *
- * @brief Sets this ImageView from an Image instance.
- *
- * If the handle is empty, ImageView will display nothing
- * @SINCE_1_0.0
- * @param[in] image The Image instance to display.
- */
- void SetImage( Image image ) DALI_DEPRECATED_API;
-
- /**
* @brief Sets this ImageView from the given URL.
*
* If the URL is empty, ImageView will not display anything.
*/
void SetImage( const std::string& url, ImageDimensions size );
- /**
- * @DEPRECATED_1_1.4
- * @brief Gets the Image instance handle used by the ImageView.
- *
- * A valid handle will be returned only if this instance was created with New(Image) or SetImage(Image) was called.
- *
- * @SINCE_1_0.0
- * @return The Image instance currently used by the ImageView
- */
- Image GetImage() const DALI_DEPRECATED_API;
-
public: // Not intended for application developers
/// @cond internal
} // namespace Dali
-#endif // __DALI_TOOLKIT_IMAGE_VIEW_H__
+#endif // DALI_TOOLKIT_IMAGE_VIEW_H