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 typo in BorderRenderer causing the overwriting of the cache's quad geome...
[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
554469b
..
2cb24bb
100644
(file)
--- a/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@
-173,7
+173,7
@@
Vector3 ImageView::GetNaturalSize()
size.y = mImageSize.GetHeight();
size.z = std::min(size.x, size.y);
size.y = mImageSize.GetHeight();
size.z = std::min(size.x, size.y);
- if( size.x > 0 && size.
x
> 0 )
+ if( size.x > 0 && size.
y
> 0 )
{
return size;
}
{
return size;
}
@@
-215,6
+215,8
@@
float ImageView::GetWidthForHeight( float height )
void ImageView::OnStageConnection( int depth )
{
void ImageView::OnStageConnection( int depth )
{
+ Control::OnStageConnection( depth );
+
if( mRenderer )
{
CustomActor self = Self();
if( mRenderer )
{
CustomActor self = Self();
@@
-222,6
+224,18
@@
void ImageView::OnStageConnection( int depth )
}
}
}
}
+void ImageView::OnStageDisconnection()
+{
+ if( mRenderer )
+ {
+ CustomActor self = Self();
+ mRenderer.SetOffStage( self );
+ }
+
+ Control::OnStageDisconnection();
+}
+
+
///////////////////////////////////////////////////////////
//
// Properties
///////////////////////////////////////////////////////////
//
// Properties