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
Rearrange doxygen tags for recently deprecated or new APIs
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
image-view
/
image-view.cpp
diff --git
a/dali-toolkit/public-api/controls/image-view/image-view.cpp
b/dali-toolkit/public-api/controls/image-view/image-view.cpp
index
8075764
..
e3d2b67
100644
(file)
--- a/
dali-toolkit/public-api/controls/image-view/image-view.cpp
+++ b/
dali-toolkit/public-api/controls/image-view/image-view.cpp
@@
-16,14
+16,15
@@
*/
// CLASS HEADER
*/
// CLASS HEADER
-
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+// EXTERNAL INCLUDES
+#include <dali/public-api/images/resource-image.h>
+#include <dali/public-api/object/property-map.h>
+
// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/controls/image-view/image-view-impl.h>
-// EXTERNAL INCLUDES
-
namespace Dali
{
namespace Dali
{
@@
-61,19
+62,19
@@
ImageView ImageView::New( Image image )
{
ImageView imageView = Internal::ImageView::New();
imageView.SetImage( image );
{
ImageView imageView = Internal::ImageView::New();
imageView.SetImage( image );
- return
imageView
;
+ return
ImageView( imageView )
;
}
ImageView ImageView::New( const std::string& url )
{
ImageView imageView = Internal::ImageView::New();
}
ImageView ImageView::New( const std::string& url )
{
ImageView imageView = Internal::ImageView::New();
- imageView.Set
Property( ImageView::Property::RESOURCE_URL, Dali::Property::Value( url )
);
+ imageView.Set
Image( url
);
return imageView;
}
ImageView ImageView::DownCast( BaseHandle handle )
{
return imageView;
}
ImageView ImageView::DownCast( BaseHandle handle )
{
- return Control::DownCast<ImageView, Internal::ImageView>(
handle
);
+ return Control::DownCast<ImageView, Internal::ImageView>(
handle
);
}
void ImageView::SetImage( Image image )
}
void ImageView::SetImage( Image image )
@@
-81,9
+82,14
@@
void ImageView::SetImage( Image image )
Dali::Toolkit::GetImpl( *this ).SetImage( image );
}
Dali::Toolkit::GetImpl( *this ).SetImage( image );
}
+void ImageView::SetImage( const std::string& url )
+{
+ Dali::Toolkit::GetImpl( *this ).SetImage( url );
+}
+
Image ImageView::GetImage() const
{
Image ImageView::GetImage() const
{
- return
Dali::Toolkit::GetImpl( *this ).Get
Image();
+ return Image();
}
ImageView::ImageView( Internal::ImageView& implementation )
}
ImageView::ImageView( Internal::ImageView& implementation )