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
Automatic image atlasing
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
image-view
/
image-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index
c7f1d8c
..
59a3b33
100644
(file)
--- a/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@
-103,7
+103,7
@@
void ImageView::SetImage( Property::Map map )
mImageSize = ImageDimensions( width, height );
}
mImageSize = ImageDimensions( width, height );
}
-void ImageView::SetImage( const std::string& url )
+void ImageView::SetImage( const std::string& url
, ImageDimensions size
)
{
if( mUrl != url )
{
{
if( mUrl != url )
{
@@
-112,10
+112,17
@@
void ImageView::SetImage( const std::string& url )
mUrl = url;
mUrl = url;
- Actor self = Self();
- Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl );
+ if( size.GetWidth() == 0u && size.GetHeight() == 0u )
+ {
+ mImageSize = ResourceImage::GetImageSize( mUrl );
+ }
+ else
+ {
+ mImageSize = size;
+ }
- mImageSize = ResourceImage::GetImageSize( mUrl );
+ Actor self = Self();
+ Toolkit::RendererFactory::Get().ResetRenderer( mRenderer, self, mUrl, mImageSize );
}
}
}
}
@@
-209,7
+216,7
@@
void ImageView::SetProperty( BaseObject* object, Property::Index index, const Pr
if( value.Get( imageUrl ) )
{
ImageView& impl = GetImpl( imageView );
if( value.Get( imageUrl ) )
{
ImageView& impl = GetImpl( imageView );
- impl.SetImage( imageUrl );
+ impl.SetImage( imageUrl
, ImageDimensions()
);
}
// if its not a string then get a Property::Map from the property if possible.
}
// if its not a string then get a Property::Map from the property if possible.