X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.cpp;h=2cb24bb21812620ee37cf4fb466276a00e037db3;hp=9f7294bcdb977251920d8754d83455e85be4ebd2;hb=ada974666c47551b8bfdb9302acc95f91ffda901;hpb=21b42a30e8a6e94e5e523ebdaec055a91a38f046 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 9f7294b..2cb24bb 100644 --- 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); - if( size.x > 0 && size.x > 0 ) + if( size.x > 0 && size.y > 0 ) { return size; } @@ -215,6 +215,8 @@ float ImageView::GetWidthForHeight( float height ) void ImageView::OnStageConnection( int depth ) { + Control::OnStageConnection( depth ); + if( mRenderer ) { CustomActor self = Self(); @@ -229,6 +231,8 @@ void ImageView::OnStageDisconnection() CustomActor self = Self(); mRenderer.SetOffStage( self ); } + + Control::OnStageDisconnection(); }