projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fixed IsCandidate bug" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
image-view
/
image-view.h
diff --git
a/dali-toolkit/public-api/controls/image-view/image-view.h
b/dali-toolkit/public-api/controls/image-view/image-view.h
index
47806df
..
bb6d966
100644
(file)
--- a/
dali-toolkit/public-api/controls/image-view/image-view.h
+++ b/
dali-toolkit/public-api/controls/image-view/image-view.h
@@
-26,10
+26,8
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal DALI_INTERNAL
{
class ImageView;
namespace Internal DALI_INTERNAL
{
class ImageView;
@@
-76,18
+74,17
@@
class ImageView;
class DALI_TOOLKIT_API ImageView : public Control
{
public:
class DALI_TOOLKIT_API ImageView : public Control
{
public:
-
/**
* @brief Enumeration for the start and end property ranges for this control.
* @SINCE_1_0.0
*/
enum PropertyRange
{
/**
* @brief Enumeration for the start and end property ranges for this control.
* @SINCE_1_0.0
*/
enum PropertyRange
{
- PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
///< @SINCE_1_0.0
- PROPERTY_END_INDEX
= PROPERTY_START_INDEX + 1000,
///< Reserve property indices @SINCE_1_0.0
+ PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, ///< @SINCE_1_0.0
+ PROPERTY_END_INDEX
= PROPERTY_START_INDEX + 1000,
///< Reserve property indices @SINCE_1_0.0
- ANIMATABLE_PROPERTY_START_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX,
///< @SINCE_1_1.18
- ANIMATABLE_PROPERTY_END_INDEX
= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000
///< Reserve animatable property indices, @SINCE_1_1.18
+ ANIMATABLE_PROPERTY_START_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, ///< @SINCE_1_1.18
+ ANIMATABLE_PROPERTY_END_INDEX
= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000
///< Reserve animatable property indices, @SINCE_1_1.18
};
/**
};
/**
@@
-117,7
+114,6
@@
public:
*/
PRE_MULTIPLIED_ALPHA,
*/
PRE_MULTIPLIED_ALPHA,
-
// Animatable properties
/**
// Animatable properties
/**
@@
-130,7
+126,6
@@
public:
};
public:
};
public:
-
/**
* @brief Creates an uninitialized ImageView.
* @SINCE_1_0.0
/**
* @brief Creates an uninitialized ImageView.
* @SINCE_1_0.0
@@
-158,7
+153,7
@@
public:
* @param[in] url The url of the image resource to display
* @return A handle to a newly allocated ImageView
*/
* @param[in] url The url of the image resource to display
* @return A handle to a newly allocated ImageView
*/
- static ImageView New(
const std::string& url
);
+ static ImageView New(
const std::string& url
);
/**
* @brief Creates an initialized ImageView from a URL to an image resource.
/**
* @brief Creates an initialized ImageView from a URL to an image resource.
@@
-175,7
+170,7
@@
public:
* However, do not set a size that is bigger than the actual image size, as up-scaling is not available.
* The content of the area not covered by the actual image is undefined and will not be cleared.
*/
* However, do not set a size that is bigger than the actual image size, as up-scaling is not available.
* The content of the area not covered by the actual image is undefined and will not be cleared.
*/
- static ImageView New(
const std::string& url, ImageDimensions size
);
+ static ImageView New(
const std::string& url, ImageDimensions size
);
/**
* @brief Destructor.
/**
* @brief Destructor.
@@
-191,7
+186,15
@@
public:
* @SINCE_1_0.0
* @param[in] imageView ImageView to copy. The copied ImageView will point at the same implementation
*/
* @SINCE_1_0.0
* @param[in] imageView ImageView to copy. The copied ImageView will point at the same implementation
*/
- ImageView( const ImageView& imageView );
+ 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.
/**
* @brief Assignment operator.
@@
-200,7
+203,16
@@
public:
* @param[in] imageView The ImageView to assign from
* @return The updated ImageView
*/
* @param[in] imageView The ImageView to assign from
* @return The updated ImageView
*/
- ImageView& operator=( const ImageView& imageView );
+ 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.
/**
* @brief Downcasts a handle to ImageView handle.
@@
-212,7
+224,7
@@
public:
* @param[in] handle Handle to an object
* @return Handle to a ImageView or an uninitialized handle
*/
* @param[in] handle Handle to an object
* @return Handle to a ImageView or an uninitialized handle
*/
- static ImageView DownCast(
BaseHandle handle
);
+ static ImageView DownCast(
BaseHandle handle
);
/**
* @brief Sets this ImageView from the given URL.
/**
* @brief Sets this ImageView from the given URL.
@@
-224,7
+236,7
@@
public:
* @REMARK_STORAGE
* @param[in] url The URL to the image resource to display
*/
* @REMARK_STORAGE
* @param[in] url The URL to the image resource to display
*/
- void SetImage(
const std::string& url
);
+ void SetImage(
const std::string& url
);
/**
* @brief Sets this ImageView from the given URL.
/**
* @brief Sets this ImageView from the given URL.
@@
-237,10
+249,9
@@
public:
* @param[in] url The URL to the image resource to display
* @param [in] size The width and height to fit the loaded image to
*/
* @param[in] url The URL to the image resource to display
* @param [in] size The width and height to fit the loaded image to
*/
- void SetImage(
const std::string& url, ImageDimensions size
);
+ void SetImage(
const std::string& url, ImageDimensions size
);
public: // Not intended for application developers
public: // Not intended for application developers
-
/// @cond internal
/**
* @brief Creates a handle using the Toolkit::Internal implementation.
/// @cond internal
/**
* @brief Creates a handle using the Toolkit::Internal implementation.
@@
-248,7
+259,7
@@
public: // Not intended for application developers
* @SINCE_1_0.0
* @param[in] implementation The ImageView implementation
*/
* @SINCE_1_0.0
* @param[in] implementation The ImageView implementation
*/
- DALI_INTERNAL ImageView(
Internal::ImageView& implementation
);
+ DALI_INTERNAL ImageView(
Internal::ImageView& implementation
);
/**
* @brief Allows the creation of this ImageView from an Internal::CustomActor pointer.
/**
* @brief Allows the creation of this ImageView from an Internal::CustomActor pointer.
@@
-256,9
+267,8
@@
public: // Not intended for application developers
* @SINCE_1_0.0
* @param[in] internal A pointer to the internal CustomActor
*/
* @SINCE_1_0.0
* @param[in] internal A pointer to the internal CustomActor
*/
- DALI_INTERNAL ImageView(
Dali::Internal::CustomActor* internal
);
+ DALI_INTERNAL ImageView(
Dali::Internal::CustomActor* internal
);
/// @endcond
/// @endcond
-
};
/**
};
/**