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 "ImageView ResourceReady logic update" into devel/master
[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
4183b89
..
72faf14
100644
(file)
--- a/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@
-116,6
+116,7
@@
void ImageView::SetImage( const Property::Map& map )
mPropertyMap = map;
mUrl.clear();
mImage.Reset();
mPropertyMap = map;
mUrl.clear();
mImage.Reset();
+
Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap );
// Don't set mVisual until it is ready and shown. Getters will still use current visual.
if (!mVisual)
Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( mPropertyMap );
// Don't set mVisual until it is ready and shown. Getters will still use current visual.
if (!mVisual)
@@
-214,9
+215,6
@@
void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container )
{
Control::OnRelayout( size, container );
{
Control::OnRelayout( size, container );
- // If visual is being replaced then mVisual will be the replacement visual even if not ready.
- mVisual = DevelControl::GetVisual( *this, Toolkit::ImageView::Property::IMAGE );
-
if( mVisual )
{
// Pass in an empty map which uses default transform values meaning our visual fills the control
if( mVisual )
{
// Pass in an empty map which uses default transform values meaning our visual fills the control
@@
-227,6
+225,8
@@
void ImageView::OnRelayout( const Vector2& size, RelayoutContainer& container )
void ImageView::OnResourceReady( Toolkit::Control control )
{
void ImageView::OnResourceReady( Toolkit::Control control )
{
+ // Visual ready so update visual attached to this ImageView, following call to RelayoutRequest will use this visual.
+ mVisual = DevelControl::GetVisual( *this, Toolkit::ImageView::Property::IMAGE );
}
///////////////////////////////////////////////////////////
}
///////////////////////////////////////////////////////////